From 69dbe0113a86d006e4f910335e358cf1d82252b5 Mon Sep 17 00:00:00 2001 From: Trevor Bernard Date: Wed, 1 May 2013 10:31:28 -0300 Subject: [PATCH] Back port fix for LIBZMQ-526 Fix syntax error --- src/tcp_connecter.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 6f62878e..22ac2fc1 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -253,7 +253,7 @@ int zmq::tcp_connecter_t::open () zmq::fd_t zmq::tcp_connecter_t::connect () { - // Async connect have finished. Check whether an error occured. + // Async connect has finished. Check whether an error occurred int err = 0; #if defined ZMQ_HAVE_HPUX int len = sizeof (err); @@ -268,9 +268,13 @@ zmq::fd_t zmq::tcp_connecter_t::connect () #ifdef ZMQ_HAVE_WINDOWS zmq_assert (rc == 0); if (err != 0) { - if (err == WSAECONNREFUSED || err == WSAETIMEDOUT || - err == WSAECONNABORTED || err == WSAEHOSTUNREACH || - err == WSAENETUNREACH || err == WSAENETDOWN) + if (err == WSAECONNREFUSED || + err == WSAETIMEDOUT || + err == WSAECONNABORTED || + err == WSAEHOSTUNREACH || + err == WSAENETUNREACH || + err == WSAENETDOWN || + err == WSAEINVAL) return retired_fd; wsa_assert_no (err); } @@ -282,9 +286,14 @@ zmq::fd_t zmq::tcp_connecter_t::connect () err = errno; if (err != 0) { errno = err; - errno_assert (errno == ECONNREFUSED || errno == ECONNRESET || - errno == ETIMEDOUT || errno == EHOSTUNREACH || - errno == ENETUNREACH || errno == ENETDOWN); + errno_assert ( + errno == ECONNREFUSED || + errno == ECONNRESET || + errno == ETIMEDOUT || + errno == EHOSTUNREACH || + errno == ENETUNREACH || + errno == ENETDOWN || + errno == EINVAL); return retired_fd; } #endif