From: Balaji <balajig81@gmail.com>
Date: Thu, 23 Oct 2014 15:25:25 +0000 (+0000)
Subject: zebra: MBGP routes should not be installed in the kernel
X-Git-Tag: frr-2.0-rc1~674
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7498d58d56705851de9db5f5676aaa7da3ebe35b;p=matthieu%2Ffrr.git

zebra: MBGP routes should not be installed in the kernel

MBGP routes are used only for PIM RPF checks and hence should
not be installed in the kernel's FIB. Ignore route node set to Multicast
SAFI.

Signed-off-by: Balaji.G <balajig81@gmail.com>
Acked-by: Everton Marques <everton.marques@gmail.com>
[pushed down rn->table->info assignment below assert]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

(cherry picked from commit 9511633e08ff15c23608983fdc1bc735d427332e)

Conflicts:
	zebra/zebra_rib.c
---

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 04ec3adacc..f7290caea9 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1635,8 +1635,10 @@ rib_process (struct route_node *rn)
   rib_dest_t *dest;
   struct zebra_vrf *zvrf = NULL;
   vrf_id_t vrf_id = VRF_UNKNOWN;
+  rib_table_info_t *info;
 
   assert (rn);
+  info = rn->table->info;
   
   dest = rib_dest_from_rnode (rn);
   if (dest)
@@ -1718,6 +1720,9 @@ rib_process (struct route_node *rn)
           continue;
         }
 
+      if (info->safi == SAFI_MULTICAST)
+	continue;
+
       /* Infinite distance. */
       if (rib->distance == DISTANCE_INFINITY)
         {