Revert "GetDefaultLocalAddress should return false when the address is invalid"
This reverts commit 67c6df6153b7b6dceb2b569daf683a498b2fc13c.
TBR=pthatcher@webrtc.org
BUG=
Review URL: https://codereview.webrtc.org/1470363002 .
Cr-Commit-Position: refs/heads/master@{#10780}
diff --git a/webrtc/base/network.cc b/webrtc/base/network.cc
index 678541d..f35dcba 100644
--- a/webrtc/base/network.cc
+++ b/webrtc/base/network.cc
@@ -345,10 +345,10 @@
bool NetworkManagerBase::GetDefaultLocalAddress(int family,
IPAddress* ipaddr) const {
- if (family == AF_INET && !default_local_ipv4_address_.IsNil()) {
+ if (family == AF_INET) {
*ipaddr = default_local_ipv4_address_;
return true;
- } else if (family == AF_INET6 && !default_local_ipv6_address_.IsNil()) {
+ } else if (family == AF_INET6) {
*ipaddr = default_local_ipv6_address_;
return true;
}
diff --git a/webrtc/base/network_unittest.cc b/webrtc/base/network_unittest.cc
index cfba62b..5324e86 100644
--- a/webrtc/base/network_unittest.cc
+++ b/webrtc/base/network_unittest.cc
@@ -100,7 +100,6 @@
class TestBasicNetworkManager : public BasicNetworkManager {
public:
using BasicNetworkManager::QueryDefaultLocalAddress;
- using BasicNetworkManager::set_default_local_addresses;
};
// Test that the Network ctor works properly.
@@ -849,17 +848,9 @@
NetworkMonitorFactory::ReleaseFactory(factory);
}
-TEST_F(NetworkTest, DefaultLocalAddress) {
+TEST_F(NetworkTest, DefaultPrivateAddress) {
TestBasicNetworkManager manager;
manager.StartUpdating();
- IPAddress ip;
-
- // GetDefaultLocalAddress should return false when not set.
- EXPECT_FALSE(manager.GetDefaultLocalAddress(AF_INET, &ip));
- EXPECT_FALSE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
-
- // Make sure we can query default local address when an address for such
- // address family exists.
std::vector<Network*> networks;
manager.GetNetworks(&networks);
for (auto& network : networks) {
@@ -869,14 +860,6 @@
EXPECT_TRUE(manager.QueryDefaultLocalAddress(AF_INET6) != IPAddress());
}
}
-
- // GetDefaultLocalAddress should return the valid default address after set.
- manager.set_default_local_addresses(GetLoopbackIP(AF_INET),
- GetLoopbackIP(AF_INET6));
- EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET, &ip));
- EXPECT_EQ(ip, GetLoopbackIP(AF_INET));
- EXPECT_TRUE(manager.GetDefaultLocalAddress(AF_INET6, &ip));
- EXPECT_EQ(ip, GetLoopbackIP(AF_INET6));
manager.StopUpdating();
}
diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc
index 0ae3f60..13ecca4 100644
--- a/webrtc/p2p/base/stunport.cc
+++ b/webrtc/p2p/base/stunport.cc
@@ -416,12 +416,10 @@
bool result =
Network()->default_local_address_provider()->GetDefaultLocalAddress(
addr->family(), &default_address);
- if (!result) {
+ if (!result || default_address.IsNil()) {
return false;
}
- RTC_DCHECK(!default_address.IsNil())
-
addr->SetIP(default_address);
return true;
}