From e2d409a88b0f25448435fc0922278a23a1a1edc4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 28 May 2020 16:33:10 -0400 Subject: [PATCH] bgpd: Use THREAD_CANCEL instead of thread_cancel We are crashing in thread_cancel on shutdown because the thread pointer is NULL. Use the more appropriate THREAD_CANCEL macro Ticket: CM-29873 Signed-off-by: Donald Sharp --- bgpd/bgp_network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 037aeec288..d1c396a5be 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -909,7 +909,7 @@ void bgp_close(void) for (ALL_LIST_ELEMENTS(bm->listen_sockets, node, next, listener)) { if (listener->bgp) continue; - thread_cancel(listener->thread); + THREAD_OFF(listener->thread); close(listener->fd); listnode_delete(bm->listen_sockets, listener); XFREE(MTYPE_BGP_LISTENER, listener->name); -- 2.39.5