From a3d18ce6b0810ad91e3d99bcb86e56cb6d6903a0 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 31 Aug 2017 17:28:05 -0300 Subject: [PATCH] zebra: fix detection of duplicate system routes Fixes the following bugs: 1) % ip -6 route add 5000::/64 via 3000::2 % ip -6 route replace 5000::/64 via 3000::2 % ip -6 route replace 5000::/64 via 3000::2 % ip -6 route replace 5000::/64 via 3000::2 % ip -6 route replace 5000::/64 via 3000::2 % % vtysh -c "show ipv6 route" [snip] K * 5000::/64 [0/1024] via 3000::2, rt1-eth0 K * 5000::/64 [0/1024] via 3000::2, rt1-eth0 K * 5000::/64 [0/1024] via 3000::2, rt1-eth0 K * 5000::/64 [0/1024] via 3000::2, rt1-eth0 K>* 5000::/64 [0/1024] via 3000::2, rt1-eth0 2) % ip -6 route add 7000::/64 via 3000::2 % ip -6 route replace 7000::/64 via 3000::3 % ip -6 ro | grep 7000 7000::/64 via 3000::3 dev rt1-eth0 metric 1024 pref medium % % vtysh -c "show ipv6 route" [snip] K * 7000::/64 [0/1024] via 3000::3, rt1-eth0 K>* 7000::/64 [0/1024] via 3000::2, rt1-eth0 NOTE: the check for ROUTE_ENTRY_REMOVED was redundant as it was already performed at the beginning of the loop. Signed-off-by: Renato Westphal --- zebra/zebra_rib.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index c9e770e20..59b693435 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -2469,12 +2469,11 @@ int rib_add(afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance, break; } /* Duplicate system route comes in. */ - else if ((rtnh = re->nexthop) - && rtnh->type == NEXTHOP_TYPE_IFINDEX - && rtnh->ifindex == nh->ifindex - && !CHECK_FLAG(re->status, ROUTE_ENTRY_REMOVED)) { + rtnh = re->nexthop; + if (nexthop_same_no_recurse(rtnh, nh)) return 0; - } + else + same = re; } /* Allocate new re structure. */ -- 2.39.5