From: Mark Stapp <mjs@voltanet.io>
Date: Fri, 16 Oct 2020 20:46:33 +0000 (-0400)
Subject: zebra: support multiple connected subnets on an interface
X-Git-Tag: base_7.6~396^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=87009d7df015c5eddb31e59380d6cf74e978578e;p=mirror%2Ffrr.git

zebra: support multiple connected subnets on an interface

We support configuration of multiple addresses in the same
subnet on a single interface: make sure that zebra supports
multiple instances of the corresponding connected route.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 0b1450c8f8..799cfa1b63 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1378,8 +1378,6 @@ static void zebra_rib_fixup_system(struct route_node *rn)
 static bool rib_compare_routes(const struct route_entry *re1,
 			       const struct route_entry *re2)
 {
-	bool result = false;
-
 	if (re1->type != re2->type)
 		return false;
 
@@ -1393,17 +1391,14 @@ static bool rib_compare_routes(const struct route_entry *re1,
 	    re1->distance != re2->distance)
 		return false;
 
-	/* Only connected routes need more checking, nexthop-by-nexthop */
+	/* We support multiple connected routes: this supports multiple
+	 * v6 link-locals, and we also support multiple addresses in the same
+	 * subnet on a single interface.
+	 */
 	if (re1->type != ZEBRA_ROUTE_CONNECT)
 		return true;
 
-	/* Quick check if shared nhe */
-	if (re1->nhe == re2->nhe)
-		return true;
-
-	result = nexthop_group_equal_no_recurse(&re1->nhe->nhg, &re2->nhe->nhg);
-
-	return result;
+	return false;
 }
 
 /*