From 44f0f87748d8cb1386bd3f9b081a41008335370d Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Sun, 20 Jan 2019 18:16:42 +0100 Subject: [PATCH] Remove NetworkManager::{set_ipv6_enabled,ipv6_enabled}. This methods were only used in test code, it should be safe to remove them. Bug: webrtc:10198 Change-Id: If2da1695f0efbff3aa9b6ebb4eebf4fdfe128593 Reviewed-on: https://webrtc-review.googlesource.com/c/118601 Reviewed-by: Qingsi Wang Commit-Queue: Qingsi Wang Cr-Commit-Position: refs/heads/master@{#26352} --- p2p/client/basic_port_allocator_unittest.cc | 4 -- rtc_base/nat_unittest.cc | 1 - rtc_base/network.cc | 43 ++++++++------------- rtc_base/network.h | 7 ---- rtc_base/network_unittest.cc | 30 +------------- 5 files changed, 17 insertions(+), 68 deletions(-) diff --git a/p2p/client/basic_port_allocator_unittest.cc b/p2p/client/basic_port_allocator_unittest.cc index 936ca2f225..061eb339dc 100644 --- a/p2p/client/basic_port_allocator_unittest.cc +++ b/p2p/client/basic_port_allocator_unittest.cc @@ -1242,10 +1242,6 @@ TEST_F(BasicPortAllocatorTest, TestGetAllPortsNoAdapters) { turn_server_.AddInternalSocket(kTurnTcpIntAddr, PROTO_TCP); AddTurnServers(kTurnUdpIntAddr, kTurnTcpIntAddr); AddTurnServers(kTurnUdpIntIPv6Addr, kTurnTcpIntIPv6Addr); - // Disable IPv6, because our test infrastructure doesn't support having IPv4 - // behind a NAT but IPv6 not, or having an IPv6 NAT. - // TODO(deadbeef): Fix this. - network_manager_.set_ipv6_enabled(false); ASSERT_TRUE(CreateSession(ICE_CANDIDATE_COMPONENT_RTP)); session_->StartGettingPorts(); EXPECT_TRUE_SIMULATED_WAIT(candidate_allocation_done_, diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc index 95504c2a81..7a0761e59c 100644 --- a/rtc_base/nat_unittest.cc +++ b/rtc_base/nat_unittest.cc @@ -221,7 +221,6 @@ bool TestConnectivity(const SocketAddress& src, const IPAddress& dst) { void TestPhysicalInternal(const SocketAddress& int_addr) { BasicNetworkManager network_manager; - network_manager.set_ipv6_enabled(true); network_manager.StartUpdating(); // Process pending messages so the network list is updated. Thread::Current()->ProcessMessages(0); diff --git a/rtc_base/network.cc b/rtc_base/network.cc index c62c3ce483..0bbb260b20 100644 --- a/rtc_base/network.cc +++ b/rtc_base/network.cc @@ -264,8 +264,7 @@ webrtc::MdnsResponderInterface* NetworkManager::GetMdnsResponder() const { } NetworkManagerBase::NetworkManagerBase() - : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED), - ipv6_enabled_(true) {} + : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED) {} NetworkManagerBase::~NetworkManagerBase() { for (const auto& kv : networks_map_) { @@ -289,17 +288,15 @@ void NetworkManagerBase::GetAnyAddressNetworks(NetworkList* networks) { } networks->push_back(ipv4_any_address_network_.get()); - if (ipv6_enabled()) { - if (!ipv6_any_address_network_) { - const rtc::IPAddress ipv6_any_address(in6addr_any); - ipv6_any_address_network_.reset(new rtc::Network( - "any", "any", ipv6_any_address, 0, ADAPTER_TYPE_ANY)); - ipv6_any_address_network_->set_default_local_address_provider(this); - ipv6_any_address_network_->AddIP(ipv6_any_address); - ipv6_any_address_network_->SetMdnsResponder(GetMdnsResponder()); - } - networks->push_back(ipv6_any_address_network_.get()); + if (!ipv6_any_address_network_) { + const rtc::IPAddress ipv6_any_address(in6addr_any); + ipv6_any_address_network_.reset( + new rtc::Network("any", "any", ipv6_any_address, 0, ADAPTER_TYPE_ANY)); + ipv6_any_address_network_->set_default_local_address_provider(this); + ipv6_any_address_network_->AddIP(ipv6_any_address); + ipv6_any_address_network_->SetMdnsResponder(GetMdnsResponder()); } + networks->push_back(ipv6_any_address_network_.get()); } void NetworkManagerBase::GetNetworks(NetworkList* result) const { @@ -520,10 +517,6 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces, cursor->ifa_addr->sa_family != AF_INET6) { continue; } - // Skip IPv6 if not enabled. - if (cursor->ifa_addr->sa_family == AF_INET6 && !ipv6_enabled()) { - continue; - } // Convert to InterfaceAddress. if (!ifaddrs_converter->ConvertIfAddrsToIPAddress(cursor, &ip, &mask)) { continue; @@ -699,20 +692,16 @@ bool BasicNetworkManager::CreateNetworks(bool include_ignored, break; } case AF_INET6: { - if (ipv6_enabled()) { - sockaddr_in6* v6_addr = - reinterpret_cast(address->Address.lpSockaddr); - scope_id = v6_addr->sin6_scope_id; - ip = IPAddress(v6_addr->sin6_addr); + sockaddr_in6* v6_addr = + reinterpret_cast(address->Address.lpSockaddr); + scope_id = v6_addr->sin6_scope_id; + ip = IPAddress(v6_addr->sin6_addr); - if (IsIgnoredIPv6(InterfaceAddress(ip))) { - continue; - } - - break; - } else { + if (IsIgnoredIPv6(InterfaceAddress(ip))) { continue; } + + break; } default: { continue; } } diff --git a/rtc_base/network.h b/rtc_base/network.h index b5772a817e..aa806af514 100644 --- a/rtc_base/network.h +++ b/rtc_base/network.h @@ -153,12 +153,6 @@ class NetworkManagerBase : public NetworkManager { void GetNetworks(NetworkList* networks) const override; void GetAnyAddressNetworks(NetworkList* networks) override; - // Defaults to true. - // TODO(deadbeef): Remove this. Nothing but tests use this; IPv6 is enabled - // by default everywhere else. - bool ipv6_enabled() const { return ipv6_enabled_; } - void set_ipv6_enabled(bool enabled) { ipv6_enabled_ = enabled; } - EnumerationPermission enumeration_permission() const override; bool GetDefaultLocalAddress(int family, IPAddress* ipaddr) const override; @@ -194,7 +188,6 @@ class NetworkManagerBase : public NetworkManager { NetworkList networks_; NetworkMap networks_map_; - bool ipv6_enabled_; std::unique_ptr ipv4_any_address_network_; std::unique_ptr ipv6_any_address_network_; diff --git a/rtc_base/network_unittest.cc b/rtc_base/network_unittest.cc index b1a5da6199..a98d393597 100644 --- a/rtc_base/network_unittest.cc +++ b/rtc_base/network_unittest.cc @@ -624,22 +624,10 @@ TEST_F(NetworkTest, TestCreateAndDumpNetworks) { manager.DumpNetworks(); } -// Test that we can toggle IPv6 on and off. -// Crashes on Linux. See webrtc:4923. -#if defined(WEBRTC_LINUX) -#define MAYBE_TestIPv6Toggle DISABLED_TestIPv6Toggle -#else -#define MAYBE_TestIPv6Toggle TestIPv6Toggle -#endif -TEST_F(NetworkTest, MAYBE_TestIPv6Toggle) { +TEST_F(NetworkTest, TestIPv6Toggle) { BasicNetworkManager manager; bool ipv6_found = false; NetworkManager::NetworkList list; -#if !defined(WEBRTC_WIN) - // There should be at least one IPv6 network (fe80::/64 should be in there). - // TODO(thaloun): Disabling this test on windows for the moment as the test - // machines don't seem to have IPv6 installed on them at all. - manager.set_ipv6_enabled(true); list = GetNetworks(manager, true); for (NetworkManager::NetworkList::iterator it = list.begin(); it != list.end(); ++it) { @@ -653,22 +641,6 @@ TEST_F(NetworkTest, MAYBE_TestIPv6Toggle) { it != list.end(); ++it) { delete (*it); } -#endif - ipv6_found = false; - manager.set_ipv6_enabled(false); - list = GetNetworks(manager, true); - for (NetworkManager::NetworkList::iterator it = list.begin(); - it != list.end(); ++it) { - if ((*it)->prefix().family() == AF_INET6) { - ipv6_found = true; - break; - } - } - EXPECT_FALSE(ipv6_found); - for (NetworkManager::NetworkList::iterator it = list.begin(); - it != list.end(); ++it) { - delete (*it); - } } // Test that when network interfaces are sorted and given preference values,