net/ftp/ftp_network_transaction.cc - Issue 11528012: [net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when…

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 11528012: [net] Make IPEndPoint::GetFamily() return AddressFamily and add GetSockAddrFamily() to be used when… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix AddressListTest Created 8 years 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 c4b2181b9b1e5ad26613649a26e8b40cf8f88f57..9b8cb41850d32bf7260d07fbcfe113ed267b0651 100644

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

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

@@ -683,7 +683,7 @@ int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {

response_.socket_address = HostPortPair::FromIPEndPoint(ip_endpoint);

next_state_ = STATE_CTRL_READ;

- if (ip_endpoint.GetFamily() == AF_INET) {

+ if (ip_endpoint.GetFamily() == ADDRESS_FAMILY_IPV4) {

// Do not use EPSV for IPv4 connections. Some servers become confused

// and we time out while waiting to connect. PASV is perfectly fine for

// IPv4. Note that this blacklists IPv4 not to use EPSV instead of

« no previous file with comments | « net/base/ip_endpoint.cc ('k') | net/socket/socks_client_socket.cc » ('j') | net/socket/tcp_client_socket_libevent.cc » ('J')