From 9780011846d16a5978630ccacf9eef3aa7288d42 Mon Sep 17 00:00:00 2001 From: normano Date: Wed, 1 May 2019 19:32:53 -0700 Subject: [PATCH 1/3] Fixed zmq_socket_monitor example --- doc/zmq_socket_monitor.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/zmq_socket_monitor.txt b/doc/zmq_socket_monitor.txt index f5f96f01..46a97cc1 100644 --- a/doc/zmq_socket_monitor.txt +++ b/doc/zmq_socket_monitor.txt @@ -116,9 +116,9 @@ The event value is unspecified. ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The ZMTP security mechanism handshake failed due to some mechanism protocol -error, either between the ZMTP mechanism peers, or between the mechanism -server and the ZAP handler. This indicates a configuration or implementation +The ZMTP security mechanism handshake failed due to some mechanism protocol +error, either between the ZMTP mechanism peers, or between the mechanism +server and the ZAP handler. This indicates a configuration or implementation error in either peer resp. the ZAP handler. The event value is one of the ZMQ_PROTOCOL_ERROR_* values: ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED @@ -145,7 +145,7 @@ ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA ZMQ_EVENT_HANDSHAKE_FAILED_AUTH ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The ZMTP security mechanism handshake failed due to an authentication failure. -The event value is the status code returned by the ZAP handler (i.e. 300, +The event value is the status code returned by the ZAP handler (i.e. 300, 400 or 500). @@ -259,6 +259,8 @@ int main (void) event = get_monitor_event (client_mon, NULL, NULL); assert (event == ZMQ_EVENT_CONNECTED); event = get_monitor_event (client_mon, NULL, NULL); + assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED); + event = get_monitor_event (client_mon, NULL, NULL); assert (event == ZMQ_EVENT_MONITOR_STOPPED); // This is the flow of server events @@ -267,6 +269,8 @@ int main (void) event = get_monitor_event (server_mon, NULL, NULL); assert (event == ZMQ_EVENT_ACCEPTED); event = get_monitor_event (server_mon, NULL, NULL); + assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED); + event = get_monitor_event (server_mon, NULL, NULL); assert (event == ZMQ_EVENT_CLOSED); event = get_monitor_event (server_mon, NULL, NULL); assert (event == ZMQ_EVENT_MONITOR_STOPPED); From 97b51e81d3ca1a87e6b2fabf76e34e553730a201 Mon Sep 17 00:00:00 2001 From: normano Date: Wed, 1 May 2019 19:48:49 -0700 Subject: [PATCH 2/3] Added RELICENSE for normano contribution --- RELICENSE/normano.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/normano.md diff --git a/RELICENSE/normano.md b/RELICENSE/normano.md new file mode 100644 index 00000000..f1688138 --- /dev/null +++ b/RELICENSE/normano.md @@ -0,0 +1,15 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Norman Ovenseri +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other +Open Source Initiative approved license chosen by the current ZeroMQ +BDFL (Benevolent Dictator for Life). + +A portion of the commits made by the Github handle "normano", with +commit author "normano", are copyright of Norman Ovenseri. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +This is a statement by Norman Ovenseri +2019/05/21 From dad917e04eb34caf545d4c3eb0f00f34c7d0b022 Mon Sep 17 00:00:00 2001 From: normano Date: Wed, 1 May 2019 21:43:01 -0700 Subject: [PATCH 3/3] fixed date --- RELICENSE/normano.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELICENSE/normano.md b/RELICENSE/normano.md index f1688138..0d82f5f1 100644 --- a/RELICENSE/normano.md +++ b/RELICENSE/normano.md @@ -12,4 +12,4 @@ This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above. This is a statement by Norman Ovenseri -2019/05/21 +2019/05/01