From 5ee355d1880bc7391c199ea29adc620ceb0d96f1 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Fri, 11 Jun 2010 07:02:36 +0200 Subject: if connect asserts, exact error is reported --- src/tcp_connecter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3