Add a new net::Error value: ERR_CONNECTION_TIMED_OUT.

net/socket/tcp_client_socket_win.cc

 // Copyright (c) 2006-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/socket/tcp_client_socket_win.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory_debug.h"
 #include "base/string_util.h"
@@ skipping 58 matching lines @@
     case WSA_IO_INCOMPLETE:
       return ERR_UNEXPECTED;
     case ERROR_SUCCESS:
       return OK;
     default:
       LOG(WARNING) << "Unknown error " << err << " mapped to net::ERR_FAILED";
       return ERR_FAILED;
   }
 }
 
+int MapConnectError(DWORD err) {
+  switch (err) {
+    case WSAETIMEDOUT:
+      return ERR_CONNECTION_TIMED_OUT;
+    default:
+      return MapWinsockError(err);
+  }
+}
+
 }  // namespace
 
 //-----------------------------------------------------------------------------
 
 // This class encapsulates all the state that has to be preserved as long as
 // there is a network IO operation in progress. If the owner TCPClientSocketWin
 // is destroyed while an operation is in progress, the Core is detached and it
 // lives until the operation completes and the OS doesn't reference any resource
 // declared on this class anymore.
 class TCPClientSocketWin::Core : public base::RefCounted<Core> {
@@ skipping 174 matching lines @@
     NOTREACHED();
 
     if (ResetEventIfSignaled(core_->read_overlapped_.hEvent)) {
       TRACE_EVENT_END("socket.connect", this, "");
       return OK;
     }
   } else {
     DWORD err = WSAGetLastError();
     if (err != WSAEWOULDBLOCK) {
       LOG(ERROR) << "connect failed: " << err;
-      return MapWinsockError(err);
+      return MapConnectError(err);
     }
   }
 
   core_->WatchForRead();
   waiting_connect_ = true;
   read_callback_ = callback;
   return ERR_IO_PENDING;
 }
 
 void TCPClientSocketWin::Disconnect() {
@@ skipping 248 matching lines @@
         error_code == WSAECONNREFUSED ||
         error_code == WSAENETUNREACH ||
         error_code == WSAEHOSTUNREACH ||
         error_code == WSAETIMEDOUT)) {
       // Try using the next address.
       const struct addrinfo* next = current_ai_->ai_next;
       Disconnect();
       current_ai_ = next;
       result = Connect(read_callback_);
     } else {
-      result = MapWinsockError(error_code);
+      result = MapConnectError(error_code);
     }
   } else {
     NOTREACHED();
     result = ERR_UNEXPECTED;
   }
 
   if (result != ERR_IO_PENDING)
     DoReadCallback(result);
 }
 
@@ skipping 16 matching lines @@
   BOOL ok = WSAGetOverlappedResult(socket_, &core_->write_overlapped_,
                                    &num_bytes, FALSE, &flags);
   WSAResetEvent(core_->write_overlapped_.hEvent);
   TRACE_EVENT_END("socket.write", this, StringPrintf("%d bytes", num_bytes));
   waiting_write_ = false;
   core_->write_iobuffer_ = NULL;
   DoWriteCallback(ok ? num_bytes : MapWinsockError(WSAGetLastError()));
 }
 
 }  // namespace net