Relanding: Move "max IPv6 networks" logic to BasicPortAllocator, and fix sorting.

webrtc/rtc_base/network.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.
  */
 
@@ skipping 27 matching lines @@
 #include "webrtc/rtc_base/logging.h"
 #include "webrtc/rtc_base/networkmonitor.h"
 #include "webrtc/rtc_base/socket.h"  // includes something that makes windows happy
 #include "webrtc/rtc_base/stream.h"
 #include "webrtc/rtc_base/stringencode.h"
 #include "webrtc/rtc_base/thread.h"
 
 namespace rtc {
 namespace {
 
-// Turning on IPv6 could make many IPv6 interfaces available for connectivity
-// check and delay the call setup time. kMaxIPv6Networks is the default upper
-// limit of IPv6 networks but could be changed by set_max_ipv6_networks().
-const int kMaxIPv6Networks = 5;
-
 const uint32_t kUpdateNetworksMessage = 1;
 const uint32_t kSignalNetworksMessage = 2;
 
 // Fetch list of networks every two seconds.
 const int kNetworksUpdateIntervalMs = 2000;
 
 const int kHighestNetworkPreference = 127;
 
 typedef struct {
   Network* net;
@@ skipping 23 matching lines @@
 
   // After type, networks are sorted by IP address precedence values
   // from RFC 3484-bis
   if (IPAddressPrecedence(ip_a) != IPAddressPrecedence(ip_b)) {
     return IPAddressPrecedence(ip_a) > IPAddressPrecedence(ip_b);
   }
 
   // TODO(mallinath) - Add VPN and Link speed conditions while sorting.
 
   // Networks are sorted last by key.
-  return a->key() > b->key();
+  return a->key() < b->key();
 }
 
 std::string AdapterTypeToString(AdapterType type) {
   switch (type) {
     case ADAPTER_TYPE_UNKNOWN:
       return "Unknown";
     case ADAPTER_TYPE_ETHERNET:
       return "Ethernet";
     case ADAPTER_TYPE_WIFI:
       return "Wifi";
@@ skipping 61 matching lines @@
     const {
   return ENUMERATION_ALLOWED;
 }
 
 bool NetworkManager::GetDefaultLocalAddress(int family, IPAddress* addr) const {
   return false;
 }
 
 NetworkManagerBase::NetworkManagerBase()
     : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED),
-      max_ipv6_networks_(kMaxIPv6Networks),
       ipv6_enabled_(true) {
 }
 
 NetworkManagerBase::~NetworkManagerBase() {
   for (const auto& kv : networks_map_) {
     delete kv.second;
   }
 }
 
 NetworkManager::EnumerationPermission
@@ skipping 17 matching lines @@
       ipv6_any_address_network_.reset(
           new rtc::Network("any", "any", ipv6_any_address, 0));
       ipv6_any_address_network_->set_default_local_address_provider(this);
       ipv6_any_address_network_->AddIP(ipv6_any_address);
     }
     networks->push_back(ipv6_any_address_network_.get());
   }
 }
 
 void NetworkManagerBase::GetNetworks(NetworkList* result) const {
-  int ipv6_networks = 0;
   result->clear();
-  for (Network* network : networks_) {
-    // Keep the number of IPv6 networks under |max_ipv6_networks_|.
-    if (network->prefix().family() == AF_INET6) {
-      if (ipv6_networks >= max_ipv6_networks_) {
-        continue;
-      }
-      ++ipv6_networks;
-    }
-    result->push_back(network);
-  }
+  result->insert(result->begin(), networks_.begin(), networks_.end());
 }
 
 void NetworkManagerBase::MergeNetworkList(const NetworkList& new_networks,
                                           bool* changed) {
   NetworkManager::Stats stats;
   MergeNetworkList(new_networks, changed, &stats);
 }
 
 void NetworkManagerBase::MergeNetworkList(const NetworkList& new_networks,
                                           bool* changed,
@@ skipping 745 matching lines @@
   std::stringstream ss;
   // Print out the first space-terminated token of the network desc, plus
   // the IP address.
   ss << "Net[" << description_.substr(0, description_.find(' '))
      << ":" << prefix_.ToSensitiveString() << "/" << prefix_length_
      << ":" << AdapterTypeToString(type_) << "]";
   return ss.str();
 }
 
 }  // namespace rtc