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

Fixed issue #2227 second part

Browse Source 
- removed the previously added encryption_error, less changes less bug
 - handshake fail is now signaled when an error happen while the
   mechanism is still hanshaking
This commit is contained in:
Vincent Tellier
2016-12-31 15:13:57 +01:00
parent ee98e7dca0
commit ffb31dcadd
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/stream_engine.cpp
View File

@@ -356,10 +356,7 @@ void zmq::stream_engine_t::in_event ()
// or the session has rejected the message.
if (rc == -1) {
if (errno != EAGAIN) {
if(this->process_msg == &stream_engine_t::process_handshake_command)
error(encryption_error);
else
error(protocol_error);
error(protocol_error);
return;
}
input_stopped = true;
@@ -981,7 +978,7 @@ void zmq::stream_engine_t::error (error_reason_t reason)
}
zmq_assert (session);
#ifdef ZMQ_BUILD_DRAFT_API
if(reason == encryption_error)
if(mechanism->status() == mechanism_t::handshaking)
socket->event_handshake_failed(endpoint, (int) s);
#endif
socket->event_disconnected (endpoint, (int) s);