Add support for default local address in IpcNetworkManager

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 d1ea5ca5d26560fda2b0802e6b689c77c168d0bd..aa30b5384e659b4b6ed996149e973cec3ce2188c 100644
--- a/content/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.cc
@@ -17,6 +17,7 @@
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_interfaces.h"
+#include "third_party/webrtc/base/socketaddress.h"
 
 namespace content {
 
@@ -71,12 +72,26 @@ void IpcNetworkManager::StopUpdating() {
 }
 
 void IpcNetworkManager::OnNetworkListChanged(
-    const net::NetworkInterfaceList& list) {
-
+    const net::NetworkInterfaceList& list,
+    const net::IPAddressNumber& default_ipv4_local_address,
+    const net::IPAddressNumber& default_ipv6_local_address) {
   // Update flag if network list received for the first time.
   if (!network_list_received_)
     network_list_received_ = true;
 
+  // Update the default local interfaces.
+  rtc::IPAddress ipv4;
+  if (default_ipv4_local_address.size() == net::kIPv4AddressSize) {
+    rtc::IPFromString(net::IPAddressToString(default_ipv4_local_address),

[Sergey Ulanov, 2015/11/11 18:56:33]

Using strings to convert address types may be fragile and doesn't look like the
right thing to do it. Also the code below already has to convert IPAddressNumber
to rtc::IPAddress. I suggest you add a helper in /jingle/glue/utils.h for this
operation and use it here.

+                      &ipv4);
+  }
+  rtc::IPAddress ipv6;
+  if (default_ipv6_local_address.size() == net::kIPv6AddressSize) {
+    rtc::IPFromString(net::IPAddressToString(default_ipv6_local_address),
+                      &ipv6);
+  }
+  set_default_local_addresses(ipv4, ipv6);
+
   // rtc::Network uses these prefix_length to compare network
   // interfaces discovered.
   std::vector<rtc::Network*> networks;
@@ -91,6 +106,7 @@ void IpcNetworkManager::OnNetworkListChanged(
       rtc::Network* network =
           new rtc::Network(it->name, it->name, prefix, it->prefix_length,
                            ConvertConnectionTypeToAdapterType(it->type));
+      network->set_default_local_address_provider(this);
       network->AddIP(rtc::IPAddress(address));
       networks.push_back(network);
     } else if (it->address.size() == net::kIPv6AddressSize) {
@@ -110,6 +126,7 @@ void IpcNetworkManager::OnNetworkListChanged(
         rtc::Network* network =
             new rtc::Network(it->name, it->name, prefix, it->prefix_length,
                              ConvertConnectionTypeToAdapterType(it->type));
+        network->set_default_local_address_provider(this);
         network->AddIP(ip6_addr);
         networks.push_back(network);
       }
@@ -122,6 +139,7 @@ void IpcNetworkManager::OnNetworkListChanged(
     rtc::IPAddress ip_address_v4(INADDR_LOOPBACK);
     rtc::Network* network_v4 = new rtc::Network(
         name_v4, name_v4, ip_address_v4, 32, rtc::ADAPTER_TYPE_UNKNOWN);
+    network_v4->set_default_local_address_provider(this);
     network_v4->AddIP(ip_address_v4);
     networks.push_back(network_v4);
 
@@ -129,6 +147,7 @@ void IpcNetworkManager::OnNetworkListChanged(
     rtc::IPAddress ip_address_v6(in6addr_loopback);
     rtc::Network* network_v6 = new rtc::Network(
         name_v6, name_v6, ip_address_v6, 64, rtc::ADAPTER_TYPE_UNKNOWN);
+    network_v6->set_default_local_address_provider(this);
     network_v6->AddIP(ip_address_v6);
     networks.push_back(network_v6);
   }