pimd: 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/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 50de7124d2c475bb1d429bd254657326cad0a735..795c96c83801bad11b058cf5dadab62c5d73c1a4 100644 (file)
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -671,7 +671,6 @@ void pim_igmp_general_query_on(struct igmp_sock *igmp)
                        ifaddr_str, query_interval,
                        startup_mode ? "startup" : "non-startup", igmp->fd);
        }
                        ifaddr_str, query_interval,
                        startup_mode ? "startup" : "non-startup", igmp->fd);
        }

-       igmp->t_igmp_query_timer = NULL;

        thread_add_timer(router->master, pim_igmp_general_query, igmp,
                         query_interval, &igmp->t_igmp_query_timer);
 }
        thread_add_timer(router->master, pim_igmp_general_query, igmp,
                         query_interval, &igmp->t_igmp_query_timer);
 }


@@ -1052,7 +1051,6 @@ static void igmp_read_on(struct igmp_sock *igmp)
                zlog_debug("Scheduling READ event on IGMP socket fd=%d",
                           igmp->fd);
        }
                zlog_debug("Scheduling READ event on IGMP socket fd=%d",
                           igmp->fd);
        }

-       igmp->t_igmp_read = NULL;

        thread_add_read(router->master, pim_igmp_read, igmp, igmp->fd,
                        &igmp->t_igmp_read);
 }
        thread_add_read(router->master, pim_igmp_read, igmp, igmp->fd,
                        &igmp->t_igmp_read);
 }

diff --git a/pimd/pim_msdp_socket.c b/pimd/pim_msdp_socket.c
index 78a8265a1c88362c68743ad61112150efb57af47..5fff9fca0ed5f7d7fba05e1a57538e40dc7a2da3 100644 (file)
--- a/pimd/pim_msdp_socket.c
+++ b/pimd/pim_msdp_socket.c
@@ -205,7 +205,6 @@ int pim_msdp_sock_listen(struct pim_instance *pim)
        /* add accept thread */
        listener->fd = sock;
        memcpy(&listener->su, &sin, socklen);
        /* add accept thread */
        listener->fd = sock;
        memcpy(&listener->su, &sin, socklen);

-       listener->thread = NULL;

        thread_add_read(pim->msdp.master, pim_msdp_sock_accept, pim, sock,
                        &listener->thread);
 
        thread_add_read(pim->msdp.master, pim_msdp_sock_accept, pim, sock,
                        &listener->thread);
 

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 8c38cf6c4c382648edf73cab6c9a4ae9b0aaae80..3df7dc41ce318845f89f674d4fb444e3a383e050 100644 (file)
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -415,7 +415,6 @@ static void pim_sock_read_on(struct interface *ifp)
                zlog_debug("Scheduling READ event on PIM socket fd=%d",
                           pim_ifp->pim_sock_fd);
        }
                zlog_debug("Scheduling READ event on PIM socket fd=%d",
                           pim_ifp->pim_sock_fd);
        }

-       pim_ifp->t_pim_sock_read = NULL;

        thread_add_read(router->master, pim_sock_read, ifp,
                        pim_ifp->pim_sock_fd, &pim_ifp->t_pim_sock_read);
 }
        thread_add_read(router->master, pim_sock_read, ifp,
                        pim_ifp->pim_sock_fd, &pim_ifp->t_pim_sock_read);
 }