Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

zeromq: fix version detection

Browse source
This commit is contained in:
Steffen Vogel 2018-10-20 17:35:01 +02:00
parent ef91faafac
commit ed01b9480d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/nodes/zeromq.c
View file

@ -36,7 +36,7 @@
static void *context;
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3
/** Read one event off the monitor socket; return value and address
* by reference, if not null, and event number by value.
*
@ -345,7 +345,7 @@ int zeromq_start(struct node *n)
goto fail;
}
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3
/* Monitor handshake events on the server */
ret = zmq_socket_monitor(z->in.socket, "inproc://monitor-server", ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH);
if (ret < 0)
@ -382,7 +382,7 @@ int zeromq_start(struct node *n)
}
}
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3
if (z->curve.enabled) {
ret = get_monitor_event(z->in.mon_socket, NULL, NULL);
return ret == ZMQ_EVENT_HANDSHAKE_SUCCEEDED;
@ -408,7 +408,7 @@ int zeromq_stop(struct node *n)
if (ret)
return ret;
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_MAJOR_VERSION >= 4 && ZMQ_MINOR_VERSION >= 2 && ZMQ_MINOR_VERSION >= 3
ret = zmq_close(z->in.mon_socket);
if (ret)
return ret;