From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 6 Oct 2020 14:43:09 +0000 (-0400)
Subject: Revert "bgpd: allow bestpath to handle mutliple locally-originated paths"
X-Git-Tag: base_7.6~453^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1664b411195737535f52b774f68d3e431ce02560;p=matthieu%2Ffrr.git

Revert "bgpd: allow bestpath to handle mutliple locally-originated paths"

This reverts commit 82a843fa3df4adff6d2eaffbaba96eb136fcaebb.
---

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 941bae4ff4..15c1df8473 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -550,7 +550,6 @@ static int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
 	bool same_esi;
 	bool old_proxy;
 	bool new_proxy;
-	bool new_origin, exist_origin;
 
 	*paths_eq = 0;
 
@@ -795,12 +794,8 @@ static int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
 	 *  - BGP_ROUTE_AGGREGATE
 	 *  - BGP_ROUTE_REDISTRIBUTE
 	 */
-	new_origin = !(new->sub_type == BGP_ROUTE_NORMAL ||
-		       new->sub_type == BGP_ROUTE_IMPORTED);
-	exist_origin = !(exist->sub_type == BGP_ROUTE_NORMAL ||
-			 exist->sub_type == BGP_ROUTE_IMPORTED);
-
-	if (new_origin && !exist_origin) {
+	if (!(new->sub_type == BGP_ROUTE_NORMAL ||
+	      new->sub_type == BGP_ROUTE_IMPORTED)) {
 		*reason = bgp_path_selection_local_route;
 		if (debug)
 			zlog_debug(
@@ -809,7 +804,8 @@ static int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
 		return 1;
 	}
 
-	if (!new_origin && exist_origin) {
+	if (!(exist->sub_type == BGP_ROUTE_NORMAL ||
+	      exist->sub_type == BGP_ROUTE_IMPORTED)) {
 		*reason = bgp_path_selection_local_route;
 		if (debug)
 			zlog_debug(