Push IPv6 addresses to libjingle PortAllocator.

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 <iostream>
 #include "base/bind.h"
 #include "base/sys_byteorder.h"
 #include "net/base/net_util.h"
 
 namespace content {
 
 IpcNetworkManager::IpcNetworkManager(P2PSocketDispatcher* socket_dispatcher)
     : socket_dispatcher_(socket_dispatcher),
       start_count_(0),
       network_list_received_(false),
@@ skipping 25 matching lines @@
 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;
 
   std::vector<talk_base::Network*> networks;
   for (net::NetworkInterfaceList::const_iterator it = list.begin();
        it != list.end(); it++) {
-    uint32 address;
-    if (it->address.size() != net::kIPv4AddressSize)
-      continue;
-    memcpy(&address, &it->address[0], sizeof(uint32));
-    address = talk_base::NetworkToHost32(address);
-    talk_base::Network* network = new talk_base::Network(
-        it->name, it->name, talk_base::IPAddress(address), 32);
-    network->AddIP(talk_base::IPAddress(address));
-    networks.push_back(network);
+    if (it->address.size() == net::kIPv4AddressSize) {
+      uint32 address;
+      memcpy(&address, &it->address[0], sizeof(uint32));
+      address = talk_base::NetworkToHost32(address);
+      talk_base::IPAddress ip4_addr(address);
+      int prefix_length = talk_base::CountIPMaskBits(ip4_addr);

[Ronghua Wu (Left Chromium), 2013/10/21 16:49:58]

Is the CountIPMaskBits (returns the number of contiguously set bits) the right
function for this?

Looking at:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjin...

For example I think talk_base::CountIPMaskBits("192.168.1.2") will equal 2.

[Mallinath (Gone from Chromium), 2013/10/21 16:55:46]

Agree. Prefix length should be used for only identify ip address types. Hence I
think it should work. 

As it's used for only identifying the IP address, we need to distinguish IP4 and
IP6, so it should not be a problem if we just use 32 and 64 value rather than
using CountIPMaskBits.

FYI googletalk plugin uses CountIPMaskBits and it seems to be working for IPv4
addresses so far.

On 2013/10/21 16:49:58, Ronghua Wu wrote:

+      talk_base::Network* network = new talk_base::Network(
+          it->name, it->name, talk_base::TruncateIP(ip4_addr, prefix_length),
+          prefix_length);
+      network->AddIP(ip4_addr);
+      networks.push_back(network);
+    } else if (it->address.size() == net::kIPv6AddressSize) {
+      in6_addr address;
+      memcpy(&address, &it->address[0], sizeof(in6_addr));
+      talk_base::IPAddress ip6_addr(address);
+      int prefix_length = talk_base::CountIPMaskBits(ip6_addr);
+      talk_base::Network* network = new talk_base::Network(
+          it->name, it->name, talk_base::TruncateIP(ip6_addr, prefix_length),
+          prefix_length);
+      network->AddIP(ip6_addr);
+      networks.push_back(network);
+    }
   }
 
   bool changed = false;
   MergeNetworkList(networks, &changed);
   if (changed)
     SignalNetworksChanged();
 }
 
 void IpcNetworkManager::SendNetworksChangedSignal() {
   SignalNetworksChanged();
 }
 
 }  // namespace content