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

zeromq: fix use of deprecated macros (closes #202)

Browse source
This commit is contained in:
Steffen Vogel 2018-10-20 14:52:28 +02:00
parent 8eb58e62c1
commit 139ca2a3f8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/nodes/zeromq.c
View file

@ -36,7 +36,7 @@
static void *context;
#ifdef ZMQ_BUILD_DRAFT_API
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
/** Read one event off the monitor socket; return value and address
* by reference, if not null, and event number by value.
*
@ -345,9 +345,9 @@ int zeromq_start(struct node *n)
goto fail;
}
#ifdef ZMQ_BUILD_DRAFT_API
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
/* Monitor handshake events on the server */
ret = zmq_socket_monitor(z->in.socket, "inproc://monitor-server", ZMQ_EVENT_HANDSHAKE_SUCCEED | ZMQ_EVENT_HANDSHAKE_FAILED);
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)
goto fail;
@ -382,10 +382,10 @@ int zeromq_start(struct node *n)
}
}
#ifdef ZMQ_BUILD_DRAFT_API
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
if (z->curve.enabled) {
ret = get_monitor_event(z->in.mon_socket, NULL, NULL);
return ret == ZMQ_EVENT_HANDSHAKE_SUCCEED;
return ret == ZMQ_EVENT_HANDSHAKE_SUCCEEDED;
}
else
return 0; /* The handshake events are only emitted for CurveZMQ sessions. */
@ -408,7 +408,7 @@ int zeromq_stop(struct node *n)
if (ret)
return ret;
#ifdef ZMQ_BUILD_DRAFT_API
#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= 040203
ret = zmq_close(z->in.mon_socket);
if (ret)
return ret;