Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(379)

Side by Side Diff: content/renderer/p2p/ipc_network_manager.cc

Issue 1405963021: Add support for default local address in IpcNetworkManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update test cases. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/p2p/ipc_network_manager.h" 5 #include "content/renderer/p2p/ipc_network_manager.h"
6 6
7 #include <string> 7 #include <string>
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/sys_byteorder.h" 13 #include "base/sys_byteorder.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/thread_task_runner_handle.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "jingle/glue/utils.h"
16 #include "net/base/ip_address_number.h" 17 #include "net/base/ip_address_number.h"
17 #include "net/base/net_util.h" 18 #include "net/base/net_util.h"
18 #include "net/base/network_change_notifier.h" 19 #include "net/base/network_change_notifier.h"
19 #include "net/base/network_interfaces.h" 20 #include "net/base/network_interfaces.h"
21 #include "third_party/webrtc/base/socketaddress.h"
20 22
21 namespace content { 23 namespace content {
22 24
23 namespace { 25 namespace {
24 26
25 rtc::AdapterType ConvertConnectionTypeToAdapterType( 27 rtc::AdapterType ConvertConnectionTypeToAdapterType(
26 net::NetworkChangeNotifier::ConnectionType type) { 28 net::NetworkChangeNotifier::ConnectionType type) {
27 switch (type) { 29 switch (type) {
28 case net::NetworkChangeNotifier::CONNECTION_UNKNOWN: 30 case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
29 return rtc::ADAPTER_TYPE_UNKNOWN; 31 return rtc::ADAPTER_TYPE_UNKNOWN;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 66 }
65 ++start_count_; 67 ++start_count_;
66 } 68 }
67 69
68 void IpcNetworkManager::StopUpdating() { 70 void IpcNetworkManager::StopUpdating() {
69 DCHECK_GT(start_count_, 0); 71 DCHECK_GT(start_count_, 0);
70 --start_count_; 72 --start_count_;
71 } 73 }
72 74
73 void IpcNetworkManager::OnNetworkListChanged( 75 void IpcNetworkManager::OnNetworkListChanged(
74 const net::NetworkInterfaceList& list) { 76 const net::NetworkInterfaceList& list,
75 77 const net::IPEndPoint& default_ipv4_local_address,
78 const net::IPEndPoint& default_ipv6_local_address) {
76 // Update flag if network list received for the first time. 79 // Update flag if network list received for the first time.
77 if (!network_list_received_) 80 if (!network_list_received_)
78 network_list_received_ = true; 81 network_list_received_ = true;
79 82
83 // Update the default private interface.
84 rtc::SocketAddress sock_addr_v4, sock_addr_v6;
85 jingle_glue::IPEndPointToSocketAddress(default_ipv4_local_address,
86 &sock_addr_v4);
87 jingle_glue::IPEndPointToSocketAddress(default_ipv6_local_address,
88 &sock_addr_v6);
89 set_default_local_addresses(sock_addr_v4.ipaddr(), sock_addr_v6.ipaddr());
90
80 // rtc::Network uses these prefix_length to compare network 91 // rtc::Network uses these prefix_length to compare network
81 // interfaces discovered. 92 // interfaces discovered.
82 std::vector<rtc::Network*> networks; 93 std::vector<rtc::Network*> networks;
83 for (net::NetworkInterfaceList::const_iterator it = list.begin(); 94 for (net::NetworkInterfaceList::const_iterator it = list.begin();
84 it != list.end(); it++) { 95 it != list.end(); it++) {
85 if (it->address.size() == net::kIPv4AddressSize) { 96 if (it->address.size() == net::kIPv4AddressSize) {
86 uint32 address; 97 uint32 address;
87 memcpy(&address, &it->address[0], sizeof(uint32)); 98 memcpy(&address, &it->address[0], sizeof(uint32));
88 address = rtc::NetworkToHost32(address); 99 address = rtc::NetworkToHost32(address);
89 rtc::IPAddress prefix = 100 rtc::IPAddress prefix =
90 rtc::TruncateIP(rtc::IPAddress(address), it->prefix_length); 101 rtc::TruncateIP(rtc::IPAddress(address), it->prefix_length);
91 rtc::Network* network = 102 rtc::Network* network =
92 new rtc::Network(it->name, it->name, prefix, it->prefix_length, 103 new rtc::Network(it->name, it->name, prefix, it->prefix_length,
93 ConvertConnectionTypeToAdapterType(it->type)); 104 ConvertConnectionTypeToAdapterType(it->type));
105 network->set_default_address_provider(this);
94 network->AddIP(rtc::IPAddress(address)); 106 network->AddIP(rtc::IPAddress(address));
95 networks.push_back(network); 107 networks.push_back(network);
96 } else if (it->address.size() == net::kIPv6AddressSize) { 108 } else if (it->address.size() == net::kIPv6AddressSize) {
97 in6_addr address; 109 in6_addr address;
98 memcpy(&address, &it->address[0], sizeof(in6_addr)); 110 memcpy(&address, &it->address[0], sizeof(in6_addr));
99 rtc::InterfaceAddress ip6_addr(address, it->ip_address_attributes); 111 rtc::InterfaceAddress ip6_addr(address, it->ip_address_attributes);
100 112
101 // Only allow non-deprecated IPv6 addresses which don't contain MAC. 113 // Only allow non-deprecated IPv6 addresses which don't contain MAC.
102 if (rtc::IPIsMacBased(ip6_addr) || 114 if (rtc::IPIsMacBased(ip6_addr) ||
103 (it->ip_address_attributes & net::IP_ADDRESS_ATTRIBUTE_DEPRECATED)) { 115 (it->ip_address_attributes & net::IP_ADDRESS_ATTRIBUTE_DEPRECATED)) {
104 continue; 116 continue;
105 } 117 }
106 118
107 if (!rtc::IPIsPrivate(ip6_addr)) { 119 if (!rtc::IPIsPrivate(ip6_addr)) {
108 rtc::IPAddress prefix = 120 rtc::IPAddress prefix =
109 rtc::TruncateIP(rtc::IPAddress(ip6_addr), it->prefix_length); 121 rtc::TruncateIP(rtc::IPAddress(ip6_addr), it->prefix_length);
110 rtc::Network* network = 122 rtc::Network* network =
111 new rtc::Network(it->name, it->name, prefix, it->prefix_length, 123 new rtc::Network(it->name, it->name, prefix, it->prefix_length,
112 ConvertConnectionTypeToAdapterType(it->type)); 124 ConvertConnectionTypeToAdapterType(it->type));
125 network->set_default_address_provider(this);
113 network->AddIP(ip6_addr); 126 network->AddIP(ip6_addr);
114 networks.push_back(network); 127 networks.push_back(network);
115 } 128 }
116 } 129 }
117 } 130 }
118 131
119 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 132 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
120 switches::kAllowLoopbackInPeerConnection)) { 133 switches::kAllowLoopbackInPeerConnection)) {
121 std::string name_v4("loopback_ipv4"); 134 std::string name_v4("loopback_ipv4");
122 rtc::IPAddress ip_address_v4(INADDR_LOOPBACK); 135 rtc::IPAddress ip_address_v4(INADDR_LOOPBACK);
123 rtc::Network* network_v4 = new rtc::Network( 136 rtc::Network* network_v4 = new rtc::Network(
124 name_v4, name_v4, ip_address_v4, 32, rtc::ADAPTER_TYPE_UNKNOWN); 137 name_v4, name_v4, ip_address_v4, 32, rtc::ADAPTER_TYPE_UNKNOWN);
138 network_v4->set_default_address_provider(this);
125 network_v4->AddIP(ip_address_v4); 139 network_v4->AddIP(ip_address_v4);
126 networks.push_back(network_v4); 140 networks.push_back(network_v4);
127 141
128 std::string name_v6("loopback_ipv6"); 142 std::string name_v6("loopback_ipv6");
129 rtc::IPAddress ip_address_v6(in6addr_loopback); 143 rtc::IPAddress ip_address_v6(in6addr_loopback);
130 rtc::Network* network_v6 = new rtc::Network( 144 rtc::Network* network_v6 = new rtc::Network(
131 name_v6, name_v6, ip_address_v6, 64, rtc::ADAPTER_TYPE_UNKNOWN); 145 name_v6, name_v6, ip_address_v6, 64, rtc::ADAPTER_TYPE_UNKNOWN);
146 network_v6->set_default_address_provider(this);
132 network_v6->AddIP(ip_address_v6); 147 network_v6->AddIP(ip_address_v6);
133 networks.push_back(network_v6); 148 networks.push_back(network_v6);
134 } 149 }
135 150
136 bool changed = false; 151 bool changed = false;
137 NetworkManager::Stats stats; 152 NetworkManager::Stats stats;
138 MergeNetworkList(networks, &changed, &stats); 153 MergeNetworkList(networks, &changed, &stats);
139 if (changed) 154 if (changed)
140 SignalNetworksChanged(); 155 SignalNetworksChanged();
141 156
142 // Send interface counts to UMA. 157 // Send interface counts to UMA.
143 UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv4Interfaces", 158 UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv4Interfaces",
144 stats.ipv4_network_count); 159 stats.ipv4_network_count);
145 UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv6Interfaces", 160 UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv6Interfaces",
146 stats.ipv6_network_count); 161 stats.ipv6_network_count);
147 } 162 }
148 163
149 void IpcNetworkManager::SendNetworksChangedSignal() { 164 void IpcNetworkManager::SendNetworksChangedSignal() {
150 SignalNetworksChanged(); 165 SignalNetworksChanged();
151 } 166 }
152 167
153 } // namespace content 168 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698