From: Donatas Abraitis <donatas.abraitis@gmail.com>
Date: Mon, 4 Oct 2021 16:26:20 +0000 (+0300)
Subject: pimd: Do not explicitly set the thread pointer to NULL
X-Git-Tag: base_8.2~375^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bf5335cf3421811cd419d9b40be69d2ad9ed8bde;p=matthieu%2Ffrr.git

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 50de7124d2..795c96c838 100644
--- 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);
 	}
-	igmp->t_igmp_query_timer = NULL;
 	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);
 	}
-	igmp->t_igmp_read = NULL;
 	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 78a8265a1c..5fff9fca0e 100644
--- 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);
-	listener->thread = NULL;
 	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 8c38cf6c4c..3df7dc41ce 100644
--- 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);
 	}
-	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);
 }