From: Everton Marques <everton.marques@gmail.com>
Date: Mon, 22 Sep 2014 21:00:15 +0000 (-0300)
Subject: zebra_rib: Revert debug hooks.
X-Git-Tag: frr-2.0-rc1~628
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8f26ef2c687713562dd105386a56bc2b34f5b1a0;p=matthieu%2Ffrr.git

zebra_rib: Revert debug hooks.
---

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index f7290caea9..883fe07c1b 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -436,7 +436,13 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
 	      
 	      return 1;
 	    }
-	  else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL))
+	  else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL) ||
+		   match->type == ZEBRA_ROUTE_KERNEL)
+	    /* 
+	       || match->type == ZEBRA_ROUTE_KERNEL
+	       This prevents zebra from marking recursive static route as inactive.
+	       See pimd/TODO T26.
+	    */
 	    {
 	      resolved = 0;
 	      for (newhop = match->nexthop; newhop; newhop = newhop->next)