ldpd: Do not explicitly set the thread pointer to NULL

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>

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

diff --git a/ldpd/interface.c b/ldpd/interface.c
index 3e9f2fa991b095a3806a5715b3f7854df5c5cf6c..5e04eab1b3545fda27f5d9e2d5dd0bbfe690a9b9 100644 (file)
--- a/ldpd/interface.c
+++ b/ldpd/interface.c
@@ -471,7 +471,6 @@ static void
 if_start_hello_timer(struct iface_af *ia)
 {
        thread_cancel(&ia->hello_timer);
-       ia->hello_timer = NULL;
        thread_add_timer(master, if_hello_timer, ia, if_get_hello_interval(ia),
                         &ia->hello_timer);
 }

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 2d35d097a1cdf57158daea4ff4c5105864afaf69..babadc461fad2c76fffcde90fada2aba3469aba5 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -145,7 +145,6 @@ lde(void)
                fatal(NULL);
        imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC);
        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,
                        &iev_main->ev_read);
        iev_main->handler_write = ldp_write_handler;
@@ -555,7 +554,6 @@ lde_dispatch_parent(struct thread *thread)
                                fatal(NULL);
                        imsg_init(&iev_ldpe->ibuf, fd);
                        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,
                                        &iev_ldpe->ev_read);
                        iev_ldpe->handler_write = ldp_write_handler;

diff --git a/ldpd/lde_lib.c b/ldpd/lde_lib.c
index 0f91f49920ad7d274130c4219e67441e9a525140..33bb6c0fc73b23af94bcf3b007a2522da5a3fdd2 100644 (file)
--- a/ldpd/lde_lib.c
+++ b/ldpd/lde_lib.c
@@ -1072,7 +1072,6 @@ void
 lde_gc_start_timer(void)
 {
        thread_cancel(&gc_timer);
-       gc_timer = NULL;
        thread_add_timer(master, lde_gc_timer, NULL, LDE_GC_INTERVAL,
                         &gc_timer);
 }

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index e24eba7cd438f05a44d3178105ec0948f6fdc16a..9d80bed77f8122432353ec8557c44d8f03c83d23 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -403,28 +403,24 @@ main(int argc, char *argv[])
                fatal(NULL);
        imsg_init(&iev_ldpe->ibuf, pipe_parent2ldpe[0]);
        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,
                        &iev_ldpe->ev_read);
        iev_ldpe->handler_write = ldp_write_handler;
 
        imsg_init(&iev_ldpe_sync->ibuf, pipe_parent2ldpe_sync[0]);
        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,
                        &iev_ldpe_sync->ev_read);
        iev_ldpe_sync->handler_write = ldp_write_handler;
 
        imsg_init(&iev_lde->ibuf, pipe_parent2lde[0]);
        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,
                        &iev_lde->ev_read);
        iev_lde->handler_write = ldp_write_handler;
 
        imsg_init(&iev_lde_sync->ibuf, pipe_parent2lde_sync[0]);
        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,
                        &iev_lde_sync->ev_read);
        iev_lde_sync->handler_write = ldp_write_handler;

diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index 428d2ab7b49a7fc4d766df6834fd9268311328fe..fff7ee7c67d648c4f46a4740540baef1b66b120c 100644 (file)
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -122,7 +122,6 @@ ldpe(void)
                fatal(NULL);
        imsg_init(&iev_main->ibuf, LDPD_FD_ASYNC);
        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,
                        &iev_main->ev_read);
        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. */
        global.pfkeysock = pfkey_init();
        if (sysdep.no_pfkey == 0) {
-               pfkey_ev = NULL;
                thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
                                &pfkey_ev);
        }
@@ -377,7 +375,6 @@ ldpe_dispatch_main(struct thread *thread)
                                fatal(NULL);
                        imsg_init(&iev_lde->ibuf, fd);
                        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,
                                        &iev_lde->ev_read);
                        iev_lde->handler_write = ldp_write_handler;
@@ -784,7 +781,6 @@ ldpe_dispatch_pfkey(struct thread *thread)
 {
        int      fd = THREAD_FD(thread);
 
-       pfkey_ev = NULL;
        thread_add_read(master, ldpe_dispatch_pfkey, NULL, global.pfkeysock,
                        &pfkey_ev);
 
@@ -805,13 +801,11 @@ ldpe_setup_sockets(int af, int disc_socket, int edisc_socket,
 
        /* discovery 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,
                        &af_global->disc_ev);
 
        /* extended discovery 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,
                        &af_global->edisc_ev);
 

diff --git a/ldpd/packet.c b/ldpd/packet.c
index 8735faf3dd1aefd08367833d601d3bc54fdada8b..56af16d28021b72111b7f5c81c9405d4bc30d266 100644 (file)
--- a/ldpd/packet.c
+++ b/ldpd/packet.c
@@ -141,7 +141,6 @@ disc_recv_packet(struct thread *thread)
        struct in_addr           lsr_id;
 
        /* reschedule read */
-       *threadp = NULL;
        thread_add_read(master, disc_recv_packet, threadp, fd, threadp);
 
        /* setup buffer */
@@ -425,7 +424,6 @@ session_read(struct thread *thread)
        uint16_t         pdu_len, msg_len, msg_size, max_pdu_len;
        int              ret;
 
-       tcp->rev = NULL;
        thread_add_read(master, session_read, nbr, fd, &tcp->rev);
 
        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)
                        fatal(__func__);
 
-               tcp->rev = NULL;
                thread_add_read(master, session_read, nbr, tcp->fd, &tcp->rev);
                tcp->nbr = nbr;
        }