MergeNetworkList can't group address under the same interface

content/renderer/p2p/ipc_network_manager.cc

Index: content/renderer/p2p/ipc_network_manager.cc
diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
index 8995339cb58796abb7447c0cdbcc03ab2079e3be..e97d5a6dc7353f80aa650728a7f40d96a44de807 100644
--- a/content/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.cc
@@ -84,8 +84,10 @@ void IpcNetworkManager::OnNetworkListChanged(
       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);
@@ -95,8 +97,10 @@ void IpcNetworkManager::OnNetworkListChanged(
       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);