From eef7764b8ad7eecaa18825bb4e5576e7ec8f622d Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 23 May 2017 11:15:58 +0200 Subject: [PATCH] zeromq: only check for handshake if we are in a CurveZMQ session --- lib/nodes/zeromq.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/nodes/zeromq.c b/lib/nodes/zeromq.c index 96cb9e340..6a8601103 100644 --- a/lib/nodes/zeromq.c +++ b/lib/nodes/zeromq.c @@ -334,8 +334,12 @@ int zeromq_start(struct node *n) } #ifdef ZMQ_BUILD_DRAFT_API - ret = get_monitor_event(z->subscriber.mon_socket, NULL, NULL); - return ret == ZMQ_EVENT_HANDSHAKE_SUCCEED; + if (z->curve.enabled) { + ret = get_monitor_event(z->subscriber.mon_socket, NULL, NULL); + return ret == ZMQ_EVENT_HANDSHAKE_SUCCEED; + } + else + return 0; /* The handshake events are only emitted for CurveZMQ sessions. */ #else return 0; #endif