content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc - Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix Android Created 4 years, 11 months 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/pepper/pepper_socket_utils.cc ('K') | « content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc ('k') | content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc » ('j') | media/cast/net/udp_transport.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

index 91a851228a75e8d50d6111ab1fde83a233b911fe..97f592bf2484bf9eb6c365eec0d86120b109c43a 100644

--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

@@ -604,8 +604,7 @@ void PepperTCPSocketMessageFilter::DoBind(

PP_NetAddress_Private local_addr =

NetAddressPrivateImpl::kInvalidNetAddress;

if (!NetAddressPrivateImpl::IPEndPointToNetAddress(

- ip_end_point_local.address(),

- ip_end_point_local.port(),

+ ip_end_point_local.address_number(), ip_end_point_local.port(),

&local_addr)) {

pp_result = PP_ERROR_ADDRESS_INVALID;

break;

@@ -834,12 +833,10 @@ void PepperTCPSocketMessageFilter::OnConnectCompleted(

PP_NetAddress_Private remote_addr =

NetAddressPrivateImpl::kInvalidNetAddress;

if (!NetAddressPrivateImpl::IPEndPointToNetAddress(

- ip_end_point_local.address(),

- ip_end_point_local.port(),

+ ip_end_point_local.address_number(), ip_end_point_local.port(),

&local_addr) ||

!NetAddressPrivateImpl::IPEndPointToNetAddress(

- ip_end_point_remote.address(),

- ip_end_point_remote.port(),

+ ip_end_point_remote.address_number(), ip_end_point_remote.port(),

&remote_addr)) {

pp_result = PP_ERROR_ADDRESS_INVALID;

break;

@@ -1007,12 +1004,10 @@ void PepperTCPSocketMessageFilter::OnAcceptCompleted(

return;

}

if (!NetAddressPrivateImpl::IPEndPointToNetAddress(

- ip_end_point_local.address(),

- ip_end_point_local.port(),

+ ip_end_point_local.address_number(), ip_end_point_local.port(),

&local_addr) ||

!NetAddressPrivateImpl::IPEndPointToNetAddress(

- accepted_address_.address(),

- accepted_address_.port(),

+ accepted_address_.address_number(), accepted_address_.port(),

&remote_addr)) {

SendAcceptError(context, PP_ERROR_ADDRESS_INVALID);

return;