net/ftp/ftp_network_transaction.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: net/ftp/ftp_network_transaction.cc

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

Patch Set: Feedback eroman 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

Index: net/ftp/ftp_network_transaction.cc

diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc

index a197a87137dfd64eae4509b6af9a6007b9085626..68eb537ef06dfbb7549ce2dbb83389dc06ea2a48 100644

--- a/net/ftp/ftp_network_transaction.cc

+++ b/net/ftp/ftp_network_transaction.cc

@@ -1228,8 +1228,8 @@ int FtpNetworkTransaction::DoDataConnect() {

int rv = ctrl_socket_->GetPeerAddress(&ip_endpoint);

if (rv != OK)

return Stop(rv);

- data_address = AddressList::CreateFromIPAddress(

- ip_endpoint.address(), data_connection_port_);

+ data_address = AddressList::CreateFromIPAddress(ip_endpoint.address().bytes(),

+ data_connection_port_);

data_socket_ = socket_factory_->CreateTransportClientSocket(

data_address, net_log_.net_log(), net_log_.source());

net_log_.AddEvent(

« net/dns/dns_config_service_posix.cc ('K') | « net/dns/mojo_host_type_converters.cc ('k') | net/http/http_network_transaction.cc » ('j') | net/http/http_network_transaction.cc » ('J')