proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: logic and macro cleanup in frr_zmq shim

Browse Source 
Fix a couple of logic/macro issues in the frr_zmq shim
module.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-04-06 14:41:45 -04:00
parent 1dffe35773
commit e08165def1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/frr_zmq.c
View File

@ -310,7 +310,7 @@ void frrzmq_thread_cancel(struct frrzmq_cb **cb, struct cb_core *core)
thread_cancel(&core->thread); thread_cancel(&core->thread);
if ((*cb)->read.cancelled && !(*cb)->read.thread if ((*cb)->read.cancelled && !(*cb)->read.thread
&& (*cb)->write.cancelled && (*cb)->write.thread) && (*cb)->write.cancelled && !(*cb)->write.thread)
XFREE(MTYPE_ZEROMQ_CB, *cb); XFREE(MTYPE_ZEROMQ_CB, *cb);
} }
@ -330,12 +330,16 @@ void frrzmq_check_events(struct frrzmq_cb **cbp, struct cb_core *core,
len = sizeof(events); len = sizeof(events);
if (zmq_getsockopt(cb->zmqsock, ZMQ_EVENTS, &events, &len)) if (zmq_getsockopt(cb->zmqsock, ZMQ_EVENTS, &events, &len))
return; return;
if (events & event && core->thread && !core->cancelled) { if ((events & event) && core->thread && !core->cancelled) {
struct thread_master *tm = core->thread->master; struct thread_master *tm = core->thread->master;
thread_cancel(&core->thread); thread_cancel(&core->thread);
thread_add_event(tm, (event == ZMQ_POLLIN ? frrzmq_read_msg if (event == ZMQ_POLLIN)
: frrzmq_write_msg), thread_add_event(tm, frrzmq_read_msg,
cbp, cb->fd, &core->thread);
else
thread_add_event(tm, frrzmq_write_msg,
cbp, cb->fd, &core->thread); cbp, cb->fd, &core->thread);
} }
} }