summaryrefslogtreecommitdiffstats
path: root/net/socket/tcp_client_socket_win.cc
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-07 18:58:37 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-07 18:58:37 +0000
commitc53976d541527d07f2e71f32abf6646d73071b2e (patch)
tree7d1e88ac366d9b8a50821684d655c520696cd123 /net/socket/tcp_client_socket_win.cc
parent35506359934707a1dc47e0b26684a145835dd9c3 (diff)
downloadchromium_src-c53976d541527d07f2e71f32abf6646d73071b2e.zip
chromium_src-c53976d541527d07f2e71f32abf6646d73071b2e.tar.gz
chromium_src-c53976d541527d07f2e71f32abf6646d73071b2e.tar.bz2
Add a new net::Error value: ERR_CONNECTION_TIMED_OUT.
TEST=net_unittests BUG=none Review URL: http://codereview.chromium.org/159904 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22746 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_win.cc')
-rw-r--r--net/socket/tcp_client_socket_win.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index aa0e68c..de3cac6 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -76,6 +76,15 @@ int MapWinsockError(DWORD err) {
}
}
+int MapConnectError(DWORD err) {
+ switch (err) {
+ case WSAETIMEDOUT:
+ return ERR_CONNECTION_TIMED_OUT;
+ default:
+ return MapWinsockError(err);
+ }
+}
+
} // namespace
//-----------------------------------------------------------------------------
@@ -270,7 +279,7 @@ int TCPClientSocketWin::Connect(CompletionCallback* callback) {
DWORD err = WSAGetLastError();
if (err != WSAEWOULDBLOCK) {
LOG(ERROR) << "connect failed: " << err;
- return MapWinsockError(err);
+ return MapConnectError(err);
}
}
@@ -539,7 +548,7 @@ void TCPClientSocketWin::DidCompleteConnect() {
current_ai_ = next;
result = Connect(read_callback_);
} else {
- result = MapWinsockError(error_code);
+ result = MapConnectError(error_code);
}
} else {
NOTREACHED();