Merge pull request #4417 from sworleys/Move-Multicast-Mode

[mirror_frr.git] / zebra / zebra_rib.c

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index b38a3f08d3ec635714f0e3418bfd094d1aa73be8..cc614abac54f7940dc46eba0ea7f3cce482b1975 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -125,7 +125,7 @@ _rnode_zlog(const char *_func, vrf_id_t vrf_id, struct route_node *rn,
                srcdest_rnode2str(rn, buf, sizeof(buf));
 
                if (info->safi == SAFI_MULTICAST)
-                       strcat(buf, " (MRIB)");
+                       strlcat(buf, " (MRIB)", sizeof(buf));
        } else {
                snprintf(buf, sizeof(buf), "{(route_node *) NULL}");
        }
@@ -2633,15 +2633,9 @@ int rib_add_multipath(afi_t afi, safi_t safi, struct prefix *p,
                apply_mask_ipv6(src_p);
 
        /* Set default distance by route type. */
-       if (re->distance == 0) {
+       if (re->distance == 0)
                re->distance = route_distance(re->type);
 
-               /* iBGP distance is 200. */
-               if (re->type == ZEBRA_ROUTE_BGP
-                   && CHECK_FLAG(re->flags, ZEBRA_FLAG_IBGP))
-                       re->distance = 200;
-       }
-
        /* Lookup route node.*/
        rn = srcdest_rnode_get(table, p, src_p);