From 1664b411195737535f52b774f68d3e431ce02560 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 6 Oct 2020 10:43:09 -0400 Subject: [PATCH] Revert "bgpd: allow bestpath to handle mutliple locally-originated paths" This reverts commit 82a843fa3df4adff6d2eaffbaba96eb136fcaebb. --- bgpd/bgp_route.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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( -- 2.39.5