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

Browse Source 
Added two new monitoring events:
 - ZMQ_EVENT_HANDSHAKE_SUCCEED is raised once the encryption handshake succeed
 - ZMQ_EVENT_HANDSHAKE_FAILED is raised when it failed
Both events are raised on server and client side.
This commit is contained in:
Vincent Tellier
2016-12-30 16:26:42 +01:00
parent 64b07d8132
commit b6e9e0c2d3
7 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/stream_engine.cpp
View File

@@ -356,7 +356,10 @@ void zmq::stream_engine_t::in_event ()
// or the session has rejected the message.
if (rc == -1) {
if (errno != EAGAIN) {
error (protocol_error);
if(this->process_msg == &stream_engine_t::process_handshake_command)
error(encryption_error);
else
error(protocol_error);
return;
}
input_stopped = true;
@@ -784,8 +787,12 @@ int zmq::stream_engine_t::next_handshake_command (msg_t *msg_)
}
else {
const int rc = mechanism->next_handshake_command (msg_);
if (rc == 0)
msg_->set_flags (msg_t::command);
if(mechanism->status() == mechanism_t::error)
socket->event_handshake_failed(endpoint, 0);
return rc;
}
}
@@ -863,6 +870,8 @@ void zmq::stream_engine_t::mechanism_ready ()
zmq_assert (metadata == NULL);
if (!properties.empty ())
metadata = new (std::nothrow) metadata_t (properties);
socket->event_handshake_succeed(endpoint, 0);
}
int zmq::stream_engine_t::pull_msg_from_session (msg_t *msg_)
@@ -967,6 +976,8 @@ void zmq::stream_engine_t::error (error_reason_t reason)
terminator.close();
}
zmq_assert (session);
if(reason == encryption_error)
socket->event_handshake_failed(endpoint, (int) s);
socket->event_disconnected (endpoint, (int) s);
session->flush ();
session->engine_error (reason);