From 14315ea89902f72c7f82e3bec65235a70b2063b2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 8 Aug 2016 18:56:05 -0400 Subject: [PATCH] pimd: Allow RP to clear based upon KAT(S,G) When the KAT(S,G) pops, allow the RP to clear the mroute. Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 5b7f67c703..932e06b76d 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -820,21 +820,20 @@ pim_upstream_keep_alive_timer (struct thread *t) * But this is the start. */ } + + pim_mroute_update_counters (up->channel_oil); + + if (up->channel_oil->cc.oldpktcnt >= up->channel_oil->cc.pktcnt) + { + pim_mroute_del (up->channel_oil); + pim_upstream_delete (up); + } else { - pim_mroute_update_counters (up->channel_oil); - - if (up->channel_oil->cc.oldpktcnt >= up->channel_oil->cc.pktcnt) - { - pim_mroute_del (up->channel_oil); - pim_upstream_delete (up); - } - else - { - up->t_ka_timer = NULL; - pim_upstream_keep_alive_timer_start (up, PIM_KEEPALIVE_PERIOD); - } + up->t_ka_timer = NULL; + pim_upstream_keep_alive_timer_start (up, PIM_KEEPALIVE_PERIOD); } + return 1; } -- 2.39.5