generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-15 15:16:52 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of github.com:zeromq/libzmq""

Browse Source 
This reverts commit dde69fb9fb.
This commit is contained in:
Ian Barber
2012-06-12 14:28:32 +01:00
parent 029d3dfae2
commit bdd4e1351d
6 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tcp_connecter.cpp
View File

@@ -68,13 +68,9 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
zmq::tcp_connecter_t::~tcp_connecter_t ()
{
if (wait)
cancel_timer (reconnect_timer_id);
if (handle_valid)
rm_fd (handle);
if (s != retired_fd)
close ();
zmq_assert (!wait);
zmq_assert (!handle_valid);
zmq_assert (s == retired_fd);
}
void zmq::tcp_connecter_t::process_plug ()
@@ -85,6 +81,24 @@ void zmq::tcp_connecter_t::process_plug ()
start_connecting ();
}
void zmq::tcp_connecter_t::process_term (int linger_)
{
if (wait) {
cancel_timer (reconnect_timer_id);
wait = false;
}
if (handle_valid) {
rm_fd (handle);
handle_valid = false;
}
if (s != retired_fd)
close ();
own_t::process_term (linger_);
}
void zmq::tcp_connecter_t::in_event ()
{
// We are not polling for incomming data, so we are actually called