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

Merge pull request #1652 from chrisstaite/master

Browse Source 
Adjust start of heartbeat timer
This commit is contained in:
Pieter Hintjens 2015-11-30 21:32:37 +01:00
commit 61f74e2dfc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/stream_engine.cpp
View File

@ -712,11 +712,6 @@ bool zmq::stream_engine_t::handshake ()
} }
next_msg = &stream_engine_t::next_handshake_command; next_msg = &stream_engine_t::next_handshake_command;
process_msg = &stream_engine_t::process_handshake_command; process_msg = &stream_engine_t::process_handshake_command;
if(options.heartbeat_interval > 0) {
add_timer(options.heartbeat_interval, heartbeat_ivl_timer_id);
has_heartbeat_timer = true;
}
} }
// Start polling for output if necessary. // Start polling for output if necessary.
@ -824,6 +819,11 @@ void zmq::stream_engine_t::zap_msg_available ()
void zmq::stream_engine_t::mechanism_ready () void zmq::stream_engine_t::mechanism_ready ()
{ {
if (options.heartbeat_interval > 0) {
add_timer(options.heartbeat_interval, heartbeat_ivl_timer_id);
has_heartbeat_timer = true;
}
if (options.recv_identity) { if (options.recv_identity) {
msg_t identity; msg_t identity;
mechanism->peer_identity (&identity); mechanism->peer_identity (&identity);