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

Unified Diff: net/ftp/ftp_network_transaction.cc

Issue 10491007: fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix according to review Created 8 years, 6 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
« no previous file with comments | « net/curvecp/curvecp_client_socket.cc ('k') | net/http/http_proxy_client_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/ftp/ftp_network_transaction.cc
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index a391cad32e85ec23e98e9506bdabf20a39f077bd..2c22e386a04428a8185b03be81a052a343713719 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -651,10 +651,10 @@ int FtpNetworkTransaction::DoCtrlConnect() {
int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
if (result == OK) {
// Put the peer's IP address and port into the response.
- AddressList address;
- result = ctrl_socket_->GetPeerAddress(&address);
+ IPEndPoint ip_endpoint;
+ result = ctrl_socket_->GetPeerAddress(&ip_endpoint);
if (result == OK) {
- response_.socket_address = HostPortPair::FromIPEndPoint(address.front());
+ response_.socket_address = HostPortPair::FromIPEndPoint(ip_endpoint);
next_state_ = STATE_CTRL_READ;
}
}
@@ -1188,14 +1188,15 @@ int FtpNetworkTransaction::ProcessResponseQUIT(
int FtpNetworkTransaction::DoDataConnect() {
next_state_ = STATE_DATA_CONNECT_COMPLETE;
+ IPEndPoint ip_endpoint;
AddressList data_address;
// Connect to the same host as the control socket to prevent PASV port
// scanning attacks.
- int rv = ctrl_socket_->GetPeerAddress(&data_address);
+ int rv = ctrl_socket_->GetPeerAddress(&ip_endpoint);
if (rv != OK)
return Stop(rv);
data_address = AddressList::CreateFromIPAddress(
- data_address.front().address(), data_connection_port_);
+ ip_endpoint.address(), data_connection_port_);
data_socket_.reset(socket_factory_->CreateTransportClientSocket(
data_address, net_log_.net_log(), net_log_.source()));
return data_socket_->Connect(io_callback_);
« no previous file with comments | « net/curvecp/curvecp_client_socket.cc ('k') | net/http/http_proxy_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698