]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: MBGP routes should not be installed in the kernel
authorBalaji <balajig81@gmail.com>
Thu, 23 Oct 2014 15:25:25 +0000 (15:25 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Thu, 26 May 2016 20:42:53 +0000 (20:42 +0000)
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

zebra/zebra_rib.c

index 04ec3adacc400055771daa922ab1ad0715551467..f7290caea9db827bc9853766e287e3e4d7dd0bbd 100644 (file)
@@ -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)
         {