Reimplements net::AddressList without struct addrinfo.

net/ftp/ftp_network_transaction.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
@@ skipping 635 matching lines @@
         addresses_, net_log_.net_log(), net_log_.source()));
   return ctrl_socket_->Connect(io_callback_);
 }
 
 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);
     if (result == OK) {
-      response_.socket_address = HostPortPair::FromAddrInfo(address.head());
+      response_.socket_address = HostPortPair::FromIPEndPoint(address[0]);

[eroman, 2012/05/04 01:08:41]

Here for instance code assumes that on success AddressList is non-empty, which I
believe is a correct assumption and what code should be doing. It is interesting
though that other places have conditionals to check for .empty().

I guess this case is irrelevant once you convert GetPeerAddress -->
GetPeerIPEndpoint anyway, just using it as an example :)

[szym, 2012/05/04 02:38:29]

Both HostResolverImpl and its tests assume that OK implies non empty result.
I'll leave the "if (empty())" cleanup for the next CL.
Yes, although I think GetPeerAddress will keep its name. The updated API would
match GetLocalAddress(IPEndPoint*).

       next_state_ = STATE_CTRL_READ;
     }
   }
   return result;
 }
 
 int FtpNetworkTransaction::DoCtrlRead() {
   next_state_ = STATE_CTRL_READ_COMPLETE;
   return ctrl_socket_->Read(read_ctrl_buf_, kCtrlBufLen, io_callback_);
 }
@@ skipping 519 matching lines @@
 // Data Connection
 
 int FtpNetworkTransaction::DoDataConnect() {
   next_state_ = STATE_DATA_CONNECT_COMPLETE;
   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);
   if (rv != OK)
     return Stop(rv);
-  data_address.SetPort(data_connection_port_);
+  data_address = AddressList::CreateFromIPAddress(

[eroman, 2012/05/04 01:08:41]

This is a bit awkward. How about just calling the set port directly, or setting
port on front()?

I guess doesn't really matter since GetPeerAddress() should be going away.

[szym, 2012/05/04 02:38:29]

The awkwardness comes from the immutability of IPEndPoint. I considered adding
IPEndPoint::set_port, but there are only 2 places that would use it
(HostResolverImpl and here).
It will still be:
IPEndPoint(endpoint.address(), data_connection_port_);

[eroman, 2012/05/04 04:20:22]

Ah. In that case I agree this is fine; no point changing the immutability at
this time. (Although if it complicates other stuff, seems like adding a simple
set_port() method wouldn't be a big deal).

+      data_address[0].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_);
 }
 
 int FtpNetworkTransaction::DoDataConnectComplete(int result) {
   if (result != OK && use_epsv_) {
     // It's possible we hit a broken server, sadly. They can break in different
     // ways. Some time out, some reset a connection. Fall back to PASV.
     // TODO(phajdan.jr): remember it for future transactions with this server.
@@ skipping 125 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