FTP: Open a fresh data connection after a command error.

net/ftp/ftp_network_transaction.h

 // 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.
 
 #ifndef NET_FTP_FTP_NETWORK_TRANSACTION_H_
 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
 
 #include <string>
 #include <utility>
 
@@ skipping 107 matching lines @@
     STATE_DATA_CONNECT,
     STATE_DATA_CONNECT_COMPLETE,
     STATE_DATA_READ,
     STATE_DATA_READ_COMPLETE,
     STATE_NONE
   };
 
   // Resets the members of the transaction so it can be restarted.
   void ResetStateForRestart();
 
+  // Resets the data connection after an error and switches to |next_state|.
+  void ResetDataConnectionAfterError(State next_state);
+
   void DoCallback(int result);
   void OnIOComplete(int result);
 
   // Executes correct ProcessResponse + command_name function based on last
   // issued command. Returns error code.
   int ProcessCtrlResponse();
 
   int SendFtpCommand(const std::string& command,
                      const std::string& command_for_log,
                      Command cmd);
@@ skipping 104 matching lines @@
   std::string current_remote_directory_;
 
   int data_connection_port_;
 
   ClientSocketFactory* socket_factory_;
 
   scoped_ptr<StreamSocket> ctrl_socket_;
   scoped_ptr<StreamSocket> data_socket_;
 
   State next_state_;
+
+  // State to switch to after data connection is complete.
+  State state_after_data_connection_;

[mmenke, 2012/11/14 21:05:39]

nit:  Think state_after_data_connect_ would be clearer, since "connection" is
used elsewhere to mean the connection itself rather than the act of connecting. 
Or maybe even state_after_data_connect_complete_.

[Paweł Hajdan Jr., 2012/11/14 23:30:31]

Done.

 };
 
 }  // namespace net
 
 #endif  // NET_FTP_FTP_NETWORK_TRANSACTION_H_