aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cast/common/discovery/e2e_test/tests.cc9
-rw-r--r--discovery/dnssd/impl/service_instance.cc8
2 files changed, 11 insertions, 6 deletions
diff --git a/cast/common/discovery/e2e_test/tests.cc b/cast/common/discovery/e2e_test/tests.cc
index 417b47e4..373d1133 100644
--- a/cast/common/discovery/e2e_test/tests.cc
+++ b/cast/common/discovery/e2e_test/tests.cc
@@ -123,8 +123,13 @@ discovery::Config GetConfigSettings() {
absl::optional<InterfaceInfo> loopback = GetLoopbackInterfaceForTesting();
OSP_CHECK(loopback.has_value());
discovery::Config::NetworkInfo::AddressFamilies address_families =
- discovery::Config::NetworkInfo::kUseIpV4 |
- discovery::Config::NetworkInfo::kUseIpV6;
+ discovery::Config::NetworkInfo::kNoAddressFamily;
+ if (loopback->GetIpAddressV4()) {
+ address_families |= discovery::Config::NetworkInfo::kUseIpV4;
+ }
+ if (loopback->GetIpAddressV6()) {
+ address_families |= discovery::Config::NetworkInfo::kUseIpV6;
+ }
config.network_info.push_back({loopback.value(), address_families});
return config;
diff --git a/discovery/dnssd/impl/service_instance.cc b/discovery/dnssd/impl/service_instance.cc
index 991f0ffe..9c302daa 100644
--- a/discovery/dnssd/impl/service_instance.cc
+++ b/discovery/dnssd/impl/service_instance.cc
@@ -30,10 +30,10 @@ ServiceInstance::ServiceInstance(TaskRunner* task_runner,
const Config::NetworkInfo::AddressFamilies supported_address_families =
network_info.supported_address_families;
- OSP_DCHECK((supported_address_families & Config::NetworkInfo::kUseIpV4) ||
- !network_config_.HasAddressV4());
- OSP_DCHECK((supported_address_families & Config::NetworkInfo::kUseIpV6) ||
- !network_config_.HasAddressV6());
+ OSP_DCHECK(!(supported_address_families & Config::NetworkInfo::kUseIpV4) ||
+ network_config_.HasAddressV4());
+ OSP_DCHECK(!(supported_address_families & Config::NetworkInfo::kUseIpV6) ||
+ network_config_.HasAddressV6());
if (config.enable_querying) {
querier_ = std::make_unique<QuerierImpl>(