summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/p2p
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/renderer_host/p2p')
-rw-r--r--content/browser/renderer_host/p2p/socket_dispatcher_host.cc25
-rw-r--r--content/browser/renderer_host/p2p/socket_dispatcher_host.h10
-rw-r--r--content/browser/renderer_host/p2p/socket_host_test_utils.cc5
3 files changed, 18 insertions, 22 deletions
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
index 26cbb00..b1bc3c3 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -14,7 +14,6 @@
#include "content/public/browser/resource_context.h"
#include "net/base/address_list.h"
#include "net/base/completion_callback.h"
-#include "net/base/ip_address_number.h"
#include "net/base/net_errors.h"
#include "net/base/network_interfaces.h"
#include "net/base/sys_addrinfo.h"
@@ -346,14 +345,13 @@ void P2PSocketDispatcherHost::DoGetNetworkList() {
void P2PSocketDispatcherHost::SendNetworkList(
const net::NetworkInterfaceList& list,
- const net::IPAddressNumber& default_ipv4_local_address,
- const net::IPAddressNumber& default_ipv6_local_address) {
+ const net::IPAddress& default_ipv4_local_address,
+ const net::IPAddress& default_ipv6_local_address) {
Send(new P2PMsg_NetworkListChanged(list, default_ipv4_local_address,
default_ipv6_local_address));
}
-net::IPAddressNumber P2PSocketDispatcherHost::GetDefaultLocalAddress(
- int family) {
+net::IPAddress P2PSocketDispatcherHost::GetDefaultLocalAddress(int family) {
DCHECK(family == AF_INET || family == AF_INET6);
// Creation and connection of a UDP socket might be janky.
@@ -364,25 +362,22 @@ net::IPAddressNumber P2PSocketDispatcherHost::GetDefaultLocalAddress(
net::DatagramSocket::DEFAULT_BIND, net::RandIntCallback(), NULL,
net::NetLog::Source()));
- net::IPAddressNumber ip_address_number;
+ net::IPAddress ip_address;
if (family == AF_INET) {
- ip_address_number.assign(kPublicIPv4Host,
- kPublicIPv4Host + net::kIPv4AddressSize);
+ ip_address = net::IPAddress(kPublicIPv4Host);
} else {
- ip_address_number.assign(kPublicIPv6Host,
- kPublicIPv6Host + net::kIPv6AddressSize);
+ ip_address = net::IPAddress(kPublicIPv6Host);
}
- if (socket->Connect(net::IPEndPoint(ip_address_number, kPublicPort)) !=
- net::OK) {
- return net::IPAddressNumber();
+ if (socket->Connect(net::IPEndPoint(ip_address, kPublicPort)) != net::OK) {
+ return net::IPAddress();
}
net::IPEndPoint local_address;
if (socket->GetLocalAddress(&local_address) != net::OK)
- return net::IPAddressNumber();
+ return net::IPAddress();
- return local_address.address().bytes();
+ return local_address.address();
}
void P2PSocketDispatcherHost::OnAddressResolved(
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.h b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
index 4615d2e..5b4ef05 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.h
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
@@ -94,13 +94,13 @@ class P2PSocketDispatcherHost
void DoGetNetworkList();
void SendNetworkList(const net::NetworkInterfaceList& list,
- const net::IPAddressNumber& default_ipv4_local_address,
- const net::IPAddressNumber& default_ipv6_local_address);
+ const net::IPAddress& default_ipv4_local_address,
+ const net::IPAddress& default_ipv6_local_address);
// This connects a UDP socket to a public IP address and gets local
// address. Since it binds to the "any" address (0.0.0.0 or ::) internally, it
// retrieves the default local address.
- net::IPAddressNumber GetDefaultLocalAddress(int family);
+ net::IPAddress GetDefaultLocalAddress(int family);
void OnAddressResolved(DnsRequest* request,
const net::IPAddressList& addresses);
@@ -117,8 +117,8 @@ class P2PSocketDispatcherHost
std::set<DnsRequest*> dns_requests_;
P2PMessageThrottler throttler_;
- net::IPAddressNumber default_ipv4_local_address_;
- net::IPAddressNumber default_ipv6_local_address_;
+ net::IPAddress default_ipv4_local_address_;
+ net::IPAddress default_ipv6_local_address_;
bool dump_incoming_rtp_packet_;
bool dump_outgoing_rtp_packet_;
diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.cc b/content/browser/renderer_host/p2p/socket_host_test_utils.cc
index f1e20b6..81ca20d 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.cc
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.cc
@@ -11,6 +11,7 @@
#include "base/thread_task_runner_handle.h"
#include "net/base/completion_callback.h"
#include "net/base/io_buffer.h"
+#include "net/base/ip_address.h"
const int kStunHeaderSize = 20;
const uint16_t kStunBindingRequest = 0x0001;
@@ -213,7 +214,7 @@ void CreateStunError(std::vector<char>* packet) {
}
net::IPEndPoint ParseAddress(const std::string& ip_str, uint16_t port) {
- net::IPAddressNumber ip;
- EXPECT_TRUE(net::ParseIPLiteralToNumber(ip_str, &ip));
+ net::IPAddress ip;
+ EXPECT_TRUE(ip.AssignFromIPLiteral(ip_str));
return net::IPEndPoint(ip, port);
}