From: Donald Sharp Date: Tue, 8 Nov 2016 00:43:13 +0000 (-0500) Subject: pimd: Don't delete ifchannel if expiry timer is still running. X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~119 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=45b0c8f3cfb4981a2b32d5115ca68ecac1184e93;p=mirror%2Ffrr.git 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 --- diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 835ea424c5..5838bfa63e 100644 --- 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); }