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 radio dish support by swapping server / client roles

Browse source
This commit is contained in:
Steffen Vogel 2017-05-23 15:15:13 +02:00
parent d6970abd82
commit 09b37a1bfc
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/nodes/zeromq.c
View file

@ -241,7 +241,7 @@ int zeromq_start(struct node *n)
/* Join group */
switch (z->pattern) {
case ZEROMQ_PATTERN_RADIODISH:
ret = zmq_join(z->publisher.socket, z->filter);
ret = zmq_join(z->subscriber.socket, z->filter);
break;
case ZEROMQ_PATTERN_PUBSUB:
@ -317,25 +317,25 @@ int zeromq_start(struct node *n)
if (ret < 0)
goto fail;
#endif
/* Spawn server for publisher */
for (size_t i = 0; i < list_length(&z->publisher.endpoints); i++) {
char *ep = list_at(&z->publisher.endpoints, i);
ret = zmq_bind(z->publisher.socket, ep);
if (ret)
goto fail;
}
/* Bind subscriber socket */
/* Connect subscribers to server socket */
if (z->subscriber.endpoint) {
ret = zmq_bind(z->subscriber.socket, z->subscriber.endpoint);
ret = zmq_connect(z->subscriber.socket, z->subscriber.endpoint);
if (ret) {
info("Failed to bind ZeroMQ socket: endpoint=%s, error=%s", z->subscriber.endpoint, zmq_strerror(errno));
return ret;
}
}
/* Connect publisher socket */
for (size_t i = 0; i < list_length(&z->publisher.endpoints); i++) {
char *ep = list_at(&z->publisher.endpoints, i);
ret = zmq_connect(z->publisher.socket, ep);
if (ret)
goto fail;
}
#ifdef ZMQ_BUILD_DRAFT_API
if (z->curve.enabled) {
ret = get_monitor_event(z->subscriber.mon_socket, NULL, NULL);