generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-05 20:57:40 +01:00
Code Issues Projects Releases Wiki Activity

problem: zeromq connects peer before handshake is completed

Browse Source 
Solution: delay connecting the peer pipe until the handshake is completed
This commit is contained in:
Doron Somech
2020-05-13 17:32:06 +03:00
parent 18cacf2ec1
commit e7f0090b16
13 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/stream_engine_base.cpp
View File

@@ -102,7 +102,8 @@ static std::string get_peer_address (zmq::fd_t s_)
zmq::stream_engine_base_t::stream_engine_base_t (
fd_t fd_,
const options_t &options_,
const endpoint_uri_pair_t &endpoint_uri_pair_) :
const endpoint_uri_pair_t &endpoint_uri_pair_,
bool has_handshake_stage_) :
_options (options_),
_inpos (NULL),
_insize (0),
@@ -128,7 +129,8 @@ zmq::stream_engine_base_t::stream_engine_base_t (
_handshaking (true),
_io_error (false),
_session (NULL),
_socket (NULL)
_socket (NULL),
_has_handshake_stage (has_handshake_stage_)
{
const int rc = _tx_msg.init ();
errno_assert (rc == 0);
@@ -252,6 +254,9 @@ bool zmq::stream_engine_base_t::in_event_internal ()
// Handshaking was successful.
// Switch into the normal message flow.
_handshaking = false;
if (_mechanism == NULL && _has_handshake_stage)
_session->engine_ready ();
} else
return false;
}
@@ -520,6 +525,9 @@ void zmq::stream_engine_base_t::mechanism_ready ()
_has_heartbeat_timer = true;
}
if (_has_handshake_stage)
_session->engine_ready ();
bool flush_session = false;
if (_options.recv_routing_id) {