From bce2e60bbb3b7f799a532d9b8f2e171c570b9fea Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.commkdir>
Date: Wed, 16 Sep 2009 09:50:39 +0200
Subject: more errors from send & recv handled decently on windows

---
 src/tcp_socket.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/tcp_socket.cpp')

diff --git a/src/tcp_socket.cpp b/src/tcp_socket.cpp
index 7e68e7d..d3de66f 100644
--- a/src/tcp_socket.cpp
+++ b/src/tcp_socket.cpp
@@ -65,7 +65,13 @@ int zmq::tcp_socket_t::write (const void *data, int size)
         return 0;
 		
     //  Signalise peer failure.
-    if (nbytes == SOCKET_ERROR && WSAGetLastError () == WSAECONNRESET)
+    if (nbytes == -1 && (
+          WSAGetLastError () == WSAENETDOWN ||
+          WSAGetLastError () == WSAENETRESET ||
+          WSAGetLastError () == WSAEHOSTUNREACH ||
+          WSAGetLastError () == WSAECONNABORTED ||
+          WSAGetLastError () == WSAETIMEDOUT ||
+          WSAGetLastError () == WSAECONNRESET))
         return -1;
 
     wsa_assert (nbytes != SOCKET_ERROR);
@@ -84,6 +90,10 @@ int zmq::tcp_socket_t::read (void *data, int size)
 
     //  Connection failure.
     if (nbytes == -1 && (
+          WSAGetLastError () == WSAENETDOWN ||
+          WSAGetLastError () == WSAENETRESET ||
+          WSAGetLastError () == WSAECONNABORTED ||
+          WSAGetLastError () == WSAETIMEDOUT ||
           WSAGetLastError () == WSAECONNRESET ||
           WSAGetLastError () == WSAECONNREFUSED ||
           WSAGetLastError () == WSAENOTCONN))
-- 
cgit v1.2.3