From 5154c544ff23a1717ce85e89d22e91947e68f126 Mon Sep 17 00:00:00 2001 From: Matthias Kluwe Date: Thu, 5 Jun 2014 19:29:42 +0200 Subject: [PATCH 1/2] handle WSAEADDRINUSE in tcp_connecter_t::connect As mentioned on the mailing list, Windows may return WSAEADDRINUSE when binding (reconnecting) to a port. Added this to the handled error codes as Pieter suggested. --- src/tcp_connecter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 0bc3b55a..189b767e 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -318,7 +318,8 @@ zmq::fd_t zmq::tcp_connecter_t::connect () err == WSAENETUNREACH || err == WSAENETDOWN || err == WSAEACCES || - err == WSAEINVAL) + err == WSAEINVAL || + err == WSAEADDRINUSE ) return retired_fd; wsa_assert_no (err); } From fa95d0b5e8422394eb50bffe1d163386890286f8 Mon Sep 17 00:00:00 2001 From: Matthias Kluwe Date: Thu, 5 Jun 2014 19:39:15 +0200 Subject: [PATCH 2/2] removed whitespace (accidentially used my preferred style) --- src/tcp_connecter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 189b767e..8b5c89b0 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -319,7 +319,7 @@ zmq::fd_t zmq::tcp_connecter_t::connect () err == WSAENETDOWN || err == WSAEACCES || err == WSAEINVAL || - err == WSAEADDRINUSE ) + err == WSAEADDRINUSE) return retired_fd; wsa_assert_no (err); }