Revert "Enable IPv6 temporary address filtering on iOS."

webrtc/base/network_unittest.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/network.h"
 
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/networkmonitor.h"
 #include <vector>
 #if defined(WEBRTC_POSIX)
 #include <sys/types.h>
-#include <net/if.h>
-#include "webrtc/base/ifaddrs_converter.h"
-#endif  // defined(WEBRTC_POSIX)
+#if !defined(WEBRTC_ANDROID)
+#include <ifaddrs.h>
+#else
+#include "webrtc/base/ifaddrs-android.h"
+#endif
+#endif
 #include "webrtc/base/gunit.h"
 #if defined(WEBRTC_WIN)
 #include "webrtc/base/logging.h"  // For LOG_GLE
 #endif
 
 namespace rtc {
 
-namespace {
-
 class FakeNetworkMonitor : public NetworkMonitorBase {
  public:
   void Start() override {}
   void Stop() override {}
 };
 
 class FakeNetworkMonitorFactory : public NetworkMonitorFactory {
  public:
   FakeNetworkMonitorFactory() {}
   NetworkMonitorInterface* CreateNetworkMonitor() {
     return new FakeNetworkMonitor();
   }
 };
 
-}  // namespace
-
 class NetworkTest : public testing::Test, public sigslot::has_slots<>  {
  public:
   NetworkTest() : callback_called_(false) {}
 
   void OnNetworksChanged() {
     callback_called_ = true;
   }
 
   NetworkManager::Stats MergeNetworkList(
       BasicNetworkManager& network_manager,
@@ skipping 27 matching lines @@
     network_manager.networks_.clear();
     network_manager.networks_map_.clear();
   }
 
 #if defined(WEBRTC_POSIX)
   // Separated from CreateNetworks for tests.
   static void CallConvertIfAddrs(const BasicNetworkManager& network_manager,
                                  struct ifaddrs* interfaces,
                                  bool include_ignored,
                                  NetworkManager::NetworkList* networks) {
-    // Use the base IfAddrsConverter for test cases.
-    rtc::scoped_ptr<IfAddrsConverter> ifaddrs_converter(new IfAddrsConverter());
-    network_manager.ConvertIfAddrs(interfaces, ifaddrs_converter.get(),
-                                   include_ignored, networks);
+    network_manager.ConvertIfAddrs(interfaces, include_ignored, networks);
   }
 
   struct sockaddr_in6* CreateIpv6Addr(const std::string& ip_string,
                                       uint32_t scope_id) {
     struct sockaddr_in6* ipv6_addr = new struct sockaddr_in6;
     memset(ipv6_addr, 0, sizeof(struct sockaddr_in6));
     ipv6_addr->sin6_family = AF_INET6;
     ipv6_addr->sin6_scope_id = scope_id;
     IPAddress ip;
     IPFromString(ip_string, &ip);
     ipv6_addr->sin6_addr = ip.ipv6_address();
     return ipv6_addr;
   }
 
   // Pointers created here need to be released via ReleaseIfAddrs.
   struct ifaddrs* AddIpv6Address(struct ifaddrs* list,
                                  char* if_name,
                                  const std::string& ipv6_address,
                                  const std::string& ipv6_netmask,
                                  uint32_t scope_id) {
     struct ifaddrs* if_addr = new struct ifaddrs;
     memset(if_addr, 0, sizeof(struct ifaddrs));
     if_addr->ifa_name = if_name;
     if_addr->ifa_addr = reinterpret_cast<struct sockaddr*>(
         CreateIpv6Addr(ipv6_address, scope_id));
     if_addr->ifa_netmask =
         reinterpret_cast<struct sockaddr*>(CreateIpv6Addr(ipv6_netmask, 0));
     if_addr->ifa_next = list;
-    if_addr->ifa_flags = IFF_RUNNING;
     return if_addr;
   }
 
   void ReleaseIfAddrs(struct ifaddrs* list) {
     struct ifaddrs* if_addr = list;
     while (if_addr != nullptr) {
       struct ifaddrs* next_addr = if_addr->ifa_next;
       delete if_addr->ifa_addr;
       delete if_addr->ifa_netmask;
       delete if_addr;
@@ skipping 624 matching lines @@
                         "FFFF:FFFF:FFFF:FFFF::", 0);
   NetworkManager::NetworkList result;
   BasicNetworkManager manager;
   CallConvertIfAddrs(manager, list, true, &result);
   EXPECT_EQ(1U, result.size());
   bool changed;
   // This ensures we release the objects created in CallConvertIfAddrs.
   MergeNetworkList(manager, result, &changed);
   ReleaseIfAddrs(list);
 }
-
-TEST_F(NetworkTest, TestConvertIfAddrsNotRunning) {
-  ifaddrs list;
-  memset(&list, 0, sizeof(list));
-  list.ifa_name = const_cast<char*>("test_iface");
-  sockaddr ifa_addr;
-  sockaddr ifa_netmask;
-  list.ifa_addr = &ifa_addr;
-  list.ifa_netmask = &ifa_netmask;
-
-  NetworkManager::NetworkList result;
-  BasicNetworkManager manager;
-  CallConvertIfAddrs(manager, &list, true, &result);
-  EXPECT_TRUE(result.empty());
-}
 #endif  // defined(WEBRTC_POSIX)
 
 #if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
 // If you want to test non-default routes, you can do the following on a linux
 // machine:
 // 1) Load the dummy network driver:
 // sudo modprobe dummy
 // sudo ifconfig dummy0 127.0.0.1
 // 2) Run this test and confirm the output says it found a dummy route (and
 // passes).
@@ skipping 204 matching lines @@
   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();
 }
 
 }  // namespace rtc