summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-06-11 07:02:36 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-06-11 07:02:36 +0200
commit5ee355d1880bc7391c199ea29adc620ceb0d96f1 (patch)
tree27ab401bc26eab954770cc2b279bac67830a2c82 /src
parent27877d73ea7dd972a773c7e960706130daaf5925 (diff)
if connect asserts, exact error is reported
Diffstat (limited to 'src')
-rw-r--r--src/tcp_connecter.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp
index f50d8c7..3c82d32 100644
--- a/src/tcp_connecter.cpp
+++ b/src/tcp_connecter.cpp
@@ -117,10 +117,10 @@ zmq::fd_t zmq::tcp_connecter_t::connect ()
// Assert that the error was caused by the networking problems
// rather than 0MQ bug.
- zmq_assert (err == WSAECONNREFUSED || err == WSAETIMEDOUT ||
- err == WSAECONNABORTED || err == WSAEHOSTUNREACH);
-
errno = err;
+ errno_assert (errno == WSAECONNREFUSED || errno == WSAETIMEDOUT ||
+ errno == WSAECONNABORTED || errno == WSAEHOSTUNREACH);
+
return retired_fd;
}
@@ -293,10 +293,10 @@ zmq::fd_t zmq::tcp_connecter_t::connect ()
// Assert that the error was caused by the networking problems
// rather than 0MQ bug.
- zmq_assert (err == ECONNREFUSED || err == ECONNRESET ||
- err == ETIMEDOUT || err == EHOSTUNREACH);
-
errno = err;
+ errno_assert (errno == ECONNREFUSED || errno == ECONNRESET ||
+ errno == ETIMEDOUT || errno == EHOSTUNREACH);
+
return retired_fd;
}