3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

vtcp_connecter fixed

Browse Source 
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2011-07-27 09:29:48 +02:00
parent d7319de3d0
commit 588c728702
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/vtcp_connecter.cpp
View File

@ -28,6 +28,7 @@
#include "tcp_engine.hpp" #include "tcp_engine.hpp"
#include "io_thread.hpp" #include "io_thread.hpp"
#include "platform.hpp" #include "platform.hpp"
#include "likely.hpp"
#include "ip.hpp" #include "ip.hpp"
#include "err.hpp" #include "err.hpp"
@ -147,25 +148,18 @@ void zmq::vtcp_connecter_t::start_connecting ()
// Open the connecting socket. // Open the connecting socket.
int rc = open (); int rc = open ();
// Connect may succeed in synchronous manner. // Handle error condition by eventual reconnect.
if (rc == 0) { if (unlikely (rc != 0)) {
handle = add_fd (s); errno_assert (false);
handle_valid = true; wait = true;
out_event (); add_reconnect_timer();
return; return;
} }
// Connection establishment may be dealyed. Poll for its completion. // Connection establishment may be dealyed. Poll for its completion.
else if (rc == -1 && errno == EAGAIN) { handle = add_fd (s);
handle = add_fd (s); handle_valid = true;
handle_valid = true; set_pollout (handle);
set_pollout (handle);
return;
}
// Handle any other error condition by eventual reconnect.
wait = true;
add_reconnect_timer();
} }
void zmq::vtcp_connecter_t::add_reconnect_timer() void zmq::vtcp_connecter_t::add_reconnect_timer()
@ -203,8 +197,9 @@ int zmq::vtcp_connecter_t::open ()
{ {
zmq_assert (s == retired_fd); zmq_assert (s == retired_fd);
uint16_t port = ntohs (((sockaddr_in*) &addr)->sin_port); // Start the connection procedure.
s = vtcp_connect (*(in_addr_t*) &addr, port); sockaddr_in *paddr = (sockaddr_in*) &addr;
s = vtcp_connect (paddr->sin_addr.s_addr, ntohs (paddr->sin_port));
// Connect was successfull immediately. // Connect was successfull immediately.
if (s != retired_fd) if (s != retired_fd)
@ -230,6 +225,33 @@ zmq::fd_t zmq::vtcp_connecter_t::connect ()
return retired_fd; return retired_fd;
} }
// Set to non-blocking mode.
#ifdef ZMQ_HAVE_OPENVMS
int flags = 1;
rc = ioctl (s, FIONBIO, &flags);
errno_assert (rc != -1);
#else
int flags = fcntl (s, F_GETFL, 0);
if (flags == -1)
flags = 0;
rc = fcntl (s, F_SETFL, flags | O_NONBLOCK);
errno_assert (rc != -1);
#endif
// Disable Nagle's algorithm.
int flag = 1;
rc = setsockopt (s, IPPROTO_TCP, TCP_NODELAY, (char*) &flag,
sizeof (int));
errno_assert (rc == 0);
#ifdef ZMQ_HAVE_OPENVMS
// Disable delayed acknowledgements.
flag = 1;
rc = setsockopt (s, IPPROTO_TCP, TCP_NODELACK, (char*) &flag,
sizeof (int));
errno_assert (rc != SOCKET_ERROR);
#endif
fd_t result = s; fd_t result = s;
s = retired_fd; s = retired_fd;
return result; return result;