From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 8 Aug 2016 22:56:05 +0000 (-0400)
Subject: pimd: Allow RP to clear based upon KAT(S,G)
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~303
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=14315ea89902f72c7f82e3bec65235a70b2063b2;p=mirror%2Ffrr.git

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 <sharpd@cumulusnetworks.com>
---

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;
 }