From 862756ff85840a0fdaefb69b1a1cd7a534a04402 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 29 Jun 2017 11:50:22 -0400 Subject: [PATCH] pimd: Ensure that we properly shutdown threads on start failure Signed-off-by: Donald Sharp --- pimd/pim_ifchannel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index f7d9a4e4fb..5febd5c1ff 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -571,6 +571,10 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, if (ch->sources) list_delete(ch->sources); + THREAD_OFF(ch->t_ifjoin_expiry_timer); + THREAD_OFF(ch->t_ifjoin_prune_pending_timer); + THREAD_OFF(ch->t_ifassert_timer); + listnode_delete(pim_ifp->pim_ifchannel_list, ch); hash_release(pim_ifp->pim_ifchannel_hash, ch); listnode_delete(pim_ifp->pim->ifchannel_list, ch); -- 2.39.5