From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 19 Sep 2023 19:51:05 +0000 (-0400)
Subject: bgpd: Make debug a passed in variable for bgp_evpn_path_info_cmp
X-Git-Tag: base_9.1~60^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F14445%2Fhead;p=mirror%2Ffrr.git

bgpd: Make debug a passed in variable for bgp_evpn_path_info_cmp

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index aa23f06762..ad101f171a 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1722,8 +1722,8 @@ static void bgp_evpn_get_sync_info(struct bgp *bgp, esi_t *esi,
 				continue;
 		}
 
-		if (bgp_evpn_path_info_cmp(bgp, tmp_pi,
-				second_best_path, &paths_eq))
+		if (bgp_evpn_path_info_cmp(bgp, tmp_pi, second_best_path,
+					   &paths_eq, false))
 			second_best_path = tmp_pi;
 	}
 
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index df3397af99..1e4334ed5f 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1493,11 +1493,11 @@ int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
 
 
 int bgp_evpn_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
-			     struct bgp_path_info *exist, int *paths_eq)
+			   struct bgp_path_info *exist, int *paths_eq,
+			   bool debug)
 {
 	enum bgp_path_selection_reason reason;
 	char pfx_buf[PREFIX2STR_BUFFER] = {};
-	bool debug = false;
 
 	if (debug)
 		prefix2str(bgp_dest_get_prefix(new->net), pfx_buf,
diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 7470954bf7..54fad03e6d 100644
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -896,7 +896,8 @@ extern bool bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
 				       uint8_t type, uint8_t stype,
 				       struct attr *attr, struct bgp_dest *dest);
 extern int bgp_evpn_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
-			     struct bgp_path_info *exist, int *paths_eq);
+				  struct bgp_path_info *exist, int *paths_eq,
+				  bool debug);
 extern void bgp_aggregate_toggle_suppressed(struct bgp_aggregate *aggregate,
 					    struct bgp *bgp,
 					    const struct prefix *p, afi_t afi,