Propagate the remote socket address to URLRequest and to ViewHostMsg_FrameNavigate.

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ftp/ftp_network_transaction.h"
 
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "net/base/address_list.h"
 #include "net/base/connection_type_histograms.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/net_util.h"
 #include "net/ftp/ftp_network_session.h"
 #include "net/ftp/ftp_request_info.h"
 #include "net/ftp/ftp_util.h"
 #include "net/socket/client_socket.h"
 #include "net/socket/client_socket_factory.h"
@@ skipping 591 matching lines @@
 }
 
 int FtpNetworkTransaction::DoCtrlConnect() {
   next_state_ = STATE_CTRL_CONNECT_COMPLETE;
   ctrl_socket_.reset(socket_factory_->CreateTCPClientSocket(
         addresses_, net_log_.net_log(), net_log_.source()));
   return ctrl_socket_->Connect(&io_callback_);
 }
 
 int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
-  if (result == OK)
+  if (result == OK) {
     next_state_ = STATE_CTRL_READ;
+    // Store the socket address that we connected to.
+    AddressList address;
+    if (ctrl_socket_->GetPeerAddress(&address) == OK) {
+      response_.socket_address = NetAddressToStringWithPort(address.head());
+    } else {
+      response_.socket_address.clear();

[Paweł Hajdan Jr., 2011/02/11 19:34:54]

Do we really want it to be a silent failure? That seems worrying.

[Brian Ryner, 2011/02/11 23:01:07]

GetPeerAddress does seem to occasionally return errors in the unittests, at
least for HTTP.  I didn't dig into it too closely since I figured it was better
to always check the status code.  Is it possible that the socket has already
disconnected by the time this runs?

[Paweł Hajdan Jr., 2011/02/14 09:10:03]

The response seems to be missing the point. Maybe we need this check. However,
I'd rather want to _propagate_ the failure rather than clear some random member
variable.

I'm not sure whether the socket can be disconnected right after connecting. I
guess it might be, for example when the network suddenly breaks, but I'm not
sure.

+    }
+  }
   return result;
 }
 
 int FtpNetworkTransaction::DoCtrlRead() {
   next_state_ = STATE_CTRL_READ_COMPLETE;
   return ctrl_socket_->Read(
       read_ctrl_buf_,
       kCtrlBufLen,
       &io_callback_);
 }
@@ skipping 656 matching lines @@
   if (!had_error_type[type]) {
     had_error_type[type] = true;
     UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorHappened",
         type, NUM_OF_NET_ERROR_TYPES);
   }
   UMA_HISTOGRAM_ENUMERATION("Net.FtpDataConnectionErrorCount",
       type, NUM_OF_NET_ERROR_TYPES);
 }
 
 }  // namespace net