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 66 matching lines @@
   // 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),

[Sergey Ulanov, 2014/09/03 22:55:22]

Do you really need to truncate the prefix? Shouldn't rtc::Network() just ignore
all the bits in the address after the first it->network_prefix bits?

[guoweis_webrtc, 2014/09/03 22:58:14]

Yes, I do want to truncate the address. Network is modeled against an interface
and passing one of multiple addresses into its ctor doesn't seem right to me.
The Network class ctor is correctly defined as passing prefix which is the right
thing to do here. 

[juberti2, 2014/09/03 23:11:02]

It does seem unnecessary to pass both |prefix| and |network_prefix| into
Network. I would think just |prefix| would be sufficient.

+                                              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