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

ldpd: Do not explicitly set the thread pointer to NULL

Browse Source 
FRR should only ever use the appropriate THREAD_ON/THREAD_OFF
semantics.  This is espacially true for the functions we
end up calling the thread for.

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
This commit is contained in:
Donatas Abraitis 2021-10-04 19:25:18 +03:00
parent c34d552dd5
commit dc4a902689
7 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ldpd/accept.c
View File

@ -58,7 +58,6 @@ accept_add(int fd, int (*cb)(struct thread *), void *arg)
av->arg = arg; av->arg = arg;
LIST_INSERT_HEAD(&accept_queue.queue, av, entry); LIST_INSERT_HEAD(&accept_queue.queue, av, entry);
av->ev = NULL;
thread_add_read(master, accept_cb, av, av->fd, &av->ev); thread_add_read(master, accept_cb, av, av->fd, &av->ev);
log_debug("%s: accepting on fd %d", __func__, fd); log_debug("%s: accepting on fd %d", __func__, fd);
@ -86,7 +85,6 @@ accept_pause(void)
{ {
log_debug(__func__); log_debug(__func__);
accept_unarm(); accept_unarm();
accept_queue.evt = NULL;
thread_add_timer(master, accept_timeout, NULL, 1, &accept_queue.evt); thread_add_timer(master, accept_timeout, NULL, 1, &accept_queue.evt);
} }
@ -105,7 +103,6 @@ accept_arm(void)
{ {
struct accept_ev *av; struct accept_ev *av;
LIST_FOREACH(av, &accept_queue.queue, entry) { LIST_FOREACH(av, &accept_queue.queue, entry) {
av->ev = NULL;
thread_add_read(master, accept_cb, av, av->fd, &av->ev); thread_add_read(master, accept_cb, av, av->fd, &av->ev);
} }
} }
@ -122,7 +119,6 @@ static int
accept_cb(struct thread *thread) accept_cb(struct thread *thread)
{ {
struct accept_ev *av = THREAD_ARG(thread); struct accept_ev *av = THREAD_ARG(thread);
av->ev = NULL;
thread_add_read(master, accept_cb, av, av->fd, &av->ev); thread_add_read(master, accept_cb, av, av->fd, &av->ev);
av->accept_cb(thread); av->accept_cb(thread);

1
ldpd/interface.c
View File

@ -471,7 +471,6 @@ static void
if_start_hello_timer(struct iface_af *ia) if_start_hello_timer(struct iface_af *ia)
{ {
thread_cancel(&ia->hello_timer); thread_cancel(&ia->hello_timer);
ia->hello_timer = NULL;
thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia), thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia),
&ia->hello_timer); &ia->hello_timer);
} }

2
ldpd/lde.c
View File

@ -145,7 +145,6 @@ lde(void)
fatal(NULL); fatal(NULL);
imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC); imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC);
iev_main->handler_read = lde_dispatch_parent; iev_main->handler_read = lde_dispatch_parent;
iev_main->ev_read = NULL;
thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd, thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd,
&iev_main->ev_read); &iev_main->ev_read);
iev_main->handler_write = ldp_write_handler; iev_main->handler_write = ldp_write_handler;
@ -555,7 +554,6 @@ lde_dispatch_parent(struct thread *thread)
fatal(NULL); fatal(NULL);
imsg_init(&iev_ldpe->ibuf, fd); imsg_init(&iev_ldpe->ibuf, fd);
iev_ldpe->handler_read = lde_dispatch_imsg; iev_ldpe->handler_read = lde_dispatch_imsg;
iev_ldpe->ev_read = NULL;
thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd, thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd,
&iev_ldpe->ev_read); &iev_ldpe->ev_read);
iev_ldpe->handler_write = ldp_write_handler; iev_ldpe->handler_write = ldp_write_handler;

1
ldpd/lde_lib.c
View File

@ -1072,7 +1072,6 @@ void
lde_gc_start_timer(void) lde_gc_start_timer(void)
{ {
thread_cancel(&gc_timer); thread_cancel(&gc_timer);
gc_timer = NULL;
thread_add_timer(master, lde_gc_timer, NULL, LDE_GC_INTERVAL, thread_add_timer(master, lde_gc_timer, NULL, LDE_GC_INTERVAL,
&gc_timer); &gc_timer);
} }

4
ldpd/ldpd.c
View File

@ -403,28 +403,24 @@ main(int argc, char *argv[])
fatal(NULL); fatal(NULL);
imsg_init(&iev_ldpe->ibuf, pipe_parent2ldpe[0]); imsg_init(&iev_ldpe->ibuf, pipe_parent2ldpe[0]);
iev_ldpe->handler_read = main_dispatch_ldpe; iev_ldpe->handler_read = main_dispatch_ldpe;
iev_ldpe->ev_read = NULL;
thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd, thread_add_read(master, iev_ldpe->handler_read, iev_ldpe, iev_ldpe->ibuf.fd,
&iev_ldpe->ev_read); &iev_ldpe->ev_read);
iev_ldpe->handler_write = ldp_write_handler; iev_ldpe->handler_write = ldp_write_handler;
imsg_init(&iev_ldpe_sync->ibuf, pipe_parent2ldpe_sync[0]); imsg_init(&iev_ldpe_sync->ibuf, pipe_parent2ldpe_sync[0]);
iev_ldpe_sync->handler_read = main_dispatch_ldpe; iev_ldpe_sync->handler_read = main_dispatch_ldpe;
iev_ldpe_sync->ev_read = NULL;
thread_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, iev_ldpe_sync->ibuf.fd, thread_add_read(master, iev_ldpe_sync->handler_read, iev_ldpe_sync, iev_ldpe_sync->ibuf.fd,
&iev_ldpe_sync->ev_read); &iev_ldpe_sync->ev_read);
iev_ldpe_sync->handler_write = ldp_write_handler; iev_ldpe_sync->handler_write = ldp_write_handler;
imsg_init(&iev_lde->ibuf, pipe_parent2lde[0]); imsg_init(&iev_lde->ibuf, pipe_parent2lde[0]);
iev_lde->handler_read = main_dispatch_lde; iev_lde->handler_read = main_dispatch_lde;
iev_lde->ev_read = NULL;
thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd,
&iev_lde->ev_read); &iev_lde->ev_read);
iev_lde->handler_write = ldp_write_handler; iev_lde->handler_write = ldp_write_handler;
imsg_init(&iev_lde_sync->ibuf, pipe_parent2lde_sync[0]); imsg_init(&iev_lde_sync->ibuf, pipe_parent2lde_sync[0]);
iev_lde_sync->handler_read = main_dispatch_lde; iev_lde_sync->handler_read = main_dispatch_lde;
iev_lde_sync->ev_read = NULL;
thread_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, iev_lde_sync->ibuf.fd, thread_add_read(master, iev_lde_sync->handler_read, iev_lde_sync, iev_lde_sync->ibuf.fd,
&iev_lde_sync->ev_read); &iev_lde_sync->ev_read);
iev_lde_sync->handler_write = ldp_write_handler; iev_lde_sync->handler_write = ldp_write_handler;

6
ldpd/ldpe.c
View File

@ -122,7 +122,6 @@ ldpe(void)
fatal(NULL); fatal(NULL);
imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC); imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC);
iev_main->handler_read = ldpe_dispatch_main; iev_main->handler_read = ldpe_dispatch_main;
iev_main->ev_read = NULL;
thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd, thread_add_read(master, iev_main->handler_read, iev_main, iev_main->ibuf.fd,
&iev_main->ev_read); &iev_main->ev_read);
iev_main->handler_write = ldp_write_handler; iev_main->handler_write = ldp_write_handler;
@ -149,7 +148,6 @@ ldpe_init(struct ldpd_init *init)
/* This socket must be open before dropping privileges. */ /* This socket must be open before dropping privileges. */
global.pfkeysock = pfkey_init(); global.pfkeysock = pfkey_init();
if (sysdep.no_pfkey == 0) { if (sysdep.no_pfkey == 0) {
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev); &pfkey_ev);
} }
@ -377,7 +375,6 @@ ldpe_dispatch_main(struct thread *thread)
fatal(NULL); fatal(NULL);
imsg_init(&iev_lde->ibuf, fd); imsg_init(&iev_lde->ibuf, fd);
iev_lde->handler_read = ldpe_dispatch_lde; iev_lde->handler_read = ldpe_dispatch_lde;
iev_lde->ev_read = NULL;
thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd, thread_add_read(master, iev_lde->handler_read, iev_lde, iev_lde->ibuf.fd,
&iev_lde->ev_read); &iev_lde->ev_read);
iev_lde->handler_write = ldp_write_handler; iev_lde->handler_write = ldp_write_handler;
@ -784,7 +781,6 @@ ldpe_dispatch_pfkey(struct thread *thread)
{ {
int fd = THREAD_FD(thread); int fd = THREAD_FD(thread);
pfkey_ev = NULL;
thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock, thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
&pfkey_ev); &pfkey_ev);
@ -805,13 +801,11 @@ ldpe_setup_sockets(int af, int disc_socket, int edisc_socket,
/* discovery socket */ /* discovery socket */
af_global->ldp_disc_socket = disc_socket; af_global->ldp_disc_socket = disc_socket;
af_global->disc_ev = NULL;
thread_add_read(master, disc_recv_packet, &af_global->disc_ev, af_global->ldp_disc_socket, thread_add_read(master, disc_recv_packet, &af_global->disc_ev, af_global->ldp_disc_socket,
&af_global->disc_ev); &af_global->disc_ev);
/* extended discovery socket */ /* extended discovery socket */
af_global->ldp_edisc_socket = edisc_socket; af_global->ldp_edisc_socket = edisc_socket;
af_global->edisc_ev = NULL;
thread_add_read(master, disc_recv_packet, &af_global->edisc_ev, af_global->ldp_edisc_socket, thread_add_read(master, disc_recv_packet, &af_global->edisc_ev, af_global->ldp_edisc_socket,
&af_global->edisc_ev); &af_global->edisc_ev);

3
ldpd/packet.c
View File

@ -141,7 +141,6 @@ disc_recv_packet(struct thread *thread)
struct in_addr lsr_id; struct in_addr lsr_id;
/* reschedule read */ /* reschedule read */
*threadp = NULL;
thread_add_read(master, disc_recv_packet, threadp, fd, threadp); thread_add_read(master, disc_recv_packet, threadp, fd, threadp);
/* setup buffer */ /* setup buffer */
@ -425,7 +424,6 @@ session_read(struct thread *thread)
uint16_t pdu_len, msg_len, msg_size, max_pdu_len; uint16_t pdu_len, msg_len, msg_size, max_pdu_len;
int ret; int ret;
tcp->rev = NULL;
thread_add_read(master, session_read, nbr, fd, &tcp->rev); thread_add_read(master, session_read, nbr, fd, &tcp->rev);
if ((n = read(fd, tcp->rbuf->buf + tcp->rbuf->wpos, if ((n = read(fd, tcp->rbuf->buf + tcp->rbuf->wpos,
@ -745,7 +743,6 @@ tcp_new(int fd, struct nbr *nbr)
if ((tcp->rbuf = calloc(1, sizeof(struct ibuf_read))) == NULL) if ((tcp->rbuf = calloc(1, sizeof(struct ibuf_read))) == NULL)
fatal(__func__); fatal(__func__);
tcp->rev = NULL;
thread_add_read(master, session_read, nbr, tcp->fd, &tcp->rev); thread_add_read(master, session_read, nbr, tcp->fd, &tcp->rev);
tcp->nbr = nbr; tcp->nbr = nbr;
} }