pimd: Don't delete ifchannel if expiry timer is still running.

Don't delete the ifchannel if the expiry timer is still running.
We might need to add the prune pending timer as well?  Not sure

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

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 835ea424c55ca181033be8074b42b7fd9ec381e0..5838bfa63edf57e1081727ee6915d01158981821 100644 (file)
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -198,7 +198,8 @@ pim_ifchannel_delete_all (struct interface *ifp)
 static void delete_on_noinfo(struct pim_ifchannel *ch)
 {
   if (ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO &&
-      ch->ifjoin_state == PIM_IFJOIN_NOINFO)
+      ch->ifjoin_state == PIM_IFJOIN_NOINFO &&
+      ch->t_ifjoin_expiry_timer == NULL)
     pim_ifchannel_delete(ch);
 
 }