MergeNetworkList can't group address under the same interface

content/renderer/p2p/ipc_network_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/p2p/ipc_network_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_byteorder.h"
@@ skipping 17 matching lines @@
     case net::NetworkChangeNotifier::CONNECTION_3G:
     case net::NetworkChangeNotifier::CONNECTION_4G:
         return rtc::ADAPTER_TYPE_CELLULAR;
     default:
         return rtc::ADAPTER_TYPE_UNKNOWN;
   }
 }
 
 }  // namespace
 
-IpcNetworkManager::IpcNetworkManager(P2PSocketDispatcher* socket_dispatcher)
+IpcNetworkManager::IpcNetworkManager(
+  NetworkListObserverManager* socket_dispatcher)
     : socket_dispatcher_(socket_dispatcher),
       start_count_(0),
       network_list_received_(false),
       weak_factory_(this) {
   socket_dispatcher_->AddNetworkListObserver(this);
 }
 
 IpcNetworkManager::~IpcNetworkManager() {
   DCHECK(!start_count_);
   socket_dispatcher_->RemoveNetworkListObserver(this);
@@ skipping 15 matching lines @@
   --start_count_;
 }
 
 void IpcNetworkManager::OnNetworkListChanged(
     const net::NetworkInterfaceList& list) {
 
   // Update flag if network list received for the first time.
   if (!network_list_received_)
     network_list_received_ = true;
 
-  // Note: 32 and 64 are the arbitrary(kind of) prefix length used to
-  // differentiate IPv4 and IPv6 addresses.
   // rtc::Network uses these prefix_length to compare network
   // interfaces discovered.
   std::vector<rtc::Network*> networks;
   int ipv4_interfaces = 0;
   int ipv6_interfaces = 0;
   for (net::NetworkInterfaceList::const_iterator it = list.begin();
        it != list.end(); it++) {
     if (it->address.size() == net::kIPv4AddressSize) {
       uint32 address;
       memcpy(&address, &it->address[0], sizeof(uint32));
       address = rtc::NetworkToHost32(address);
+      rtc::IPAddress prefix = rtc::TruncateIP(rtc::IPAddress(address),
+                                              it->network_prefix);
       rtc::Network* network = new rtc::Network(
-          it->name, it->name, rtc::IPAddress(address), 32,
+          it->name, it->name, prefix, it->network_prefix,
           ConvertConnectionTypeToAdapterType(it->type));
       network->AddIP(rtc::IPAddress(address));
       networks.push_back(network);
       ++ipv4_interfaces;
     } else if (it->address.size() == net::kIPv6AddressSize) {
       in6_addr address;
       memcpy(&address, &it->address[0], sizeof(in6_addr));
       rtc::IPAddress ip6_addr(address);
       if (!rtc::IPIsPrivate(ip6_addr)) {
+        rtc::IPAddress prefix = rtc::TruncateIP(rtc::IPAddress(ip6_addr),
+                                                it->network_prefix);
         rtc::Network* network = new rtc::Network(
-            it->name, it->name, ip6_addr, 64,
+            it->name, it->name, prefix, it->network_prefix,
             ConvertConnectionTypeToAdapterType(it->type));
         network->AddIP(ip6_addr);
         networks.push_back(network);
         ++ipv6_interfaces;
       }
     }
   }
 
 
   // Send interface counts to UMA.
@@ skipping 23 matching lines @@
   MergeNetworkList(networks, &changed);
   if (changed)
     SignalNetworksChanged();
 }
 
 void IpcNetworkManager::SendNetworksChangedSignal() {
   SignalNetworksChanged();
 }
 
 }  // namespace content