pimd: Ensure that we properly shutdown threads on start failure

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index f7d9a4e4fbc6caaced99745d55bf3bda147b185e..5febd5c1ff9e1ec0704ca7f706ce9bfbec6fbdb6 100644 (file)
--- 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);