Binary File download issue (FTP)

net/ftp/ftp_network_transaction.cc

 // Copyright (c) 2008 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/string_util.h"
 #include "net/base/client_socket.h"
 #include "net/base/client_socket_factory.h"
@@ skipping 675 matching lines @@
   } else {
     command.append(" /");
   }
   next_state_ = STATE_CTRL_READ;
   return SendFtpCommand(command, COMMAND_RETR);
 }
 
 int FtpNetworkTransaction::ProcessResponseRETR(int response_code) {
   switch (GetErrorClass(response_code)) {
     case ERROR_CLASS_INITIATED:
-      next_state_ = STATE_CTRL_WRITE_QUIT;
       break;
     case ERROR_CLASS_OK:
-      next_state_ = STATE_DATA_RESOLVE_HOST;
+      next_state_ = STATE_CTRL_WRITE_QUIT;
       break;
     case ERROR_CLASS_PENDING:
       next_state_ = STATE_CTRL_WRITE_PASV;
       break;
     case ERROR_CLASS_ERROR_RETRY:
       if (response_code == 421 || response_code == 425 || response_code == 426)
         return Stop(ERR_FAILED);
       return ERR_FAILED;  // TODO(ibrar): Retry here.
     case ERROR_CLASS_ERROR:

[wtc, 2009/06/09 21:36:32]

Our convention is to not use 'else' after 'return'.
I will rewrite this if-else as:

  if (retr_failed_)
    return Stop(ERR_FAILED);
  retr_failed_ = true;

-      retr_failed_ = true;
+      if (retr_failed_) {
+        return Stop(ERR_FAILED);
+      } else {
+        retr_failed_ = true;
+      }
       next_state_ = STATE_CTRL_WRITE_PASV;
       break;
     default:
       return Stop(ERR_FAILED);
   }
   return OK;
 }
 
 // MDMT command
 int FtpNetworkTransaction::DoCtrlWriteMDTM() {
@@ skipping 98 matching lines @@
 }
 
 int FtpNetworkTransaction::ProcessResponseQUIT(int response_code) {
   ctrl_socket_->Disconnect();
   return last_error_;
 }
 
 // Data Connection
 
 int FtpNetworkTransaction::DoDataResolveHost() {
+  if (data_socket_ != NULL && data_socket_->IsConnected())
+    data_socket_->Disconnect();
+
   next_state_ = STATE_DATA_RESOLVE_HOST_COMPLETE;
 
   DidStartDnsResolution(data_connection_ip_, this);
   return resolver_.Resolve(data_connection_ip_, data_connection_port_,
       &addresses_, &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataResolveHostComplete(int result) {
   bool ok = (result == OK);
   DidFinishDnsResolutionWithStatus(ok, GURL(), this);
   if (ok) {
     next_state_ = STATE_DATA_CONNECT;
     return result;
   }
   return ERR_FAILED;
 }
 
 int FtpNetworkTransaction::DoDataConnect() {
-  if (data_socket_ != NULL && data_socket_->IsConnected())
-    data_socket_->Disconnect();
-
   next_state_ = STATE_DATA_CONNECT_COMPLETE;
   data_socket_.reset(socket_factory_->CreateTCPClientSocket(addresses_));
   return data_socket_->Connect(&io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataConnectComplete(int result) {
   if (retr_failed_) {
     next_state_ = STATE_CTRL_WRITE_CWD;
   } else {
     next_state_ = STATE_CTRL_WRITE_SIZE;
@@ skipping 11 matching lines @@
                             &io_callback_);
 }
 
 int FtpNetworkTransaction::DoDataReadComplete(int result) {
   DLOG(INFO) << read_data_buf_->data();  // The read_data_buf_ is NULL
                                          // terminated string.
   return result;
 }
 
 }  // namespace net