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

Problem: new DRAFT monitoring events are eligible for STABLE

Browse Source 
Solution: do it
This commit is contained in:
Luca Boccassi
2018-11-18 11:37:52 +00:00
parent d349f93c2b
commit c347aef794
10 changed files with 66 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/stream_engine.cpp
View File

@@ -950,9 +950,7 @@ void zmq::stream_engine_t::mechanism_ready ()
alloc_assert (_metadata);
}
#ifdef ZMQ_BUILD_DRAFT_API
_socket->event_handshake_succeeded (_endpoint, 0);
#endif
}
int zmq::stream_engine_t::pull_msg_from_session (msg_t *msg_)
@@ -1068,7 +1066,6 @@ void zmq::stream_engine_t::error (error_reason_t reason_)
_session->push_msg (&disconnect_notification);
}
#ifdef ZMQ_BUILD_DRAFT_API
// protocol errors have been signaled already at the point where they occurred
if (reason_ != protocol_error
&& (_mechanism == NULL
@@ -1076,7 +1073,7 @@ void zmq::stream_engine_t::error (error_reason_t reason_)
int err = errno;
_socket->event_handshake_failed_no_detail (_endpoint, err);
}
#endif
_socket->event_disconnected (_endpoint, _s);
_session->flush ();
_session->engine_error (reason_);