diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-05-30 10:07:34 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-05-30 10:07:34 +0200 |
commit | 0b59866a84f733e5a53b0d2f32570581691747ef (patch) | |
tree | 8861d97915544dc4385177931f299a6f27603c92 /src/connect_session.cpp | |
parent | 311fb0d852374e769d8ff791c9df38f0464960c6 (diff) |
Patches from sub-forward branch incorporated
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/connect_session.cpp')
-rw-r--r-- | src/connect_session.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/connect_session.cpp b/src/connect_session.cpp index 9a29bf1..fe7332a 100644 --- a/src/connect_session.cpp +++ b/src/connect_session.cpp @@ -111,7 +111,7 @@ void zmq::connect_session_t::start_connecting (bool wait_) zmq_assert (false); } -bool zmq::connect_session_t::attached (const blob_t &peer_identity_) +bool zmq::connect_session_t::xattached (const blob_t &peer_identity_) { // If there was no previous connection... if (!connected) { @@ -153,9 +153,12 @@ bool zmq::connect_session_t::attached (const blob_t &peer_identity_) return true; } -void zmq::connect_session_t::detached () +bool zmq::connect_session_t::xdetached () { // Reconnect. start_connecting (true); + + // Don't tear the session down. + return true; } |