bgpd: bgp_path_info_cmp should use a bool for debug

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2023-09-07 15:14:09 -04:00
parent 8ed9dca7fb
commit d16d013ca3
2 changed files with 11 additions and 7 deletions

View File

@ -594,7 +594,7 @@ struct bgp_path_info *bgp_get_imported_bpi_ultimate(struct bgp_path_info *info)
*/ */
int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new, int bgp_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,
struct bgp_maxpaths_cfg *mpath_cfg, int debug, struct bgp_maxpaths_cfg *mpath_cfg, bool debug,
char *pfx_buf, afi_t afi, safi_t safi, char *pfx_buf, afi_t afi, safi_t safi,
enum bgp_path_selection_reason *reason) enum bgp_path_selection_reason *reason)
{ {
@ -1503,9 +1503,10 @@ int bgp_evpn_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
{ {
enum bgp_path_selection_reason reason; enum bgp_path_selection_reason reason;
char pfx_buf[PREFIX2STR_BUFFER] = {}; char pfx_buf[PREFIX2STR_BUFFER] = {};
bool debug = false;
return bgp_path_info_cmp(bgp, new, exist, paths_eq, NULL, 0, pfx_buf, return bgp_path_info_cmp(bgp, new, exist, paths_eq, NULL, debug,
AFI_L2VPN, SAFI_EVPN, &reason); pfx_buf, AFI_L2VPN, SAFI_EVPN, &reason);
} }
/* Compare two bgp route entity. Return -1 if new is preferred, 1 if exist /* Compare two bgp route entity. Return -1 if new is preferred, 1 if exist
@ -1519,8 +1520,10 @@ int bgp_path_info_cmp_compatible(struct bgp *bgp, struct bgp_path_info *new,
{ {
int paths_eq; int paths_eq;
int ret; int ret;
ret = bgp_path_info_cmp(bgp, new, exist, &paths_eq, NULL, 0, pfx_buf, bool debug = false;
afi, safi, reason);
ret = bgp_path_info_cmp(bgp, new, exist, &paths_eq, NULL, debug,
pfx_buf, afi, safi, reason);
if (paths_eq) if (paths_eq)
ret = 0; ret = 0;
@ -2708,7 +2711,8 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
struct bgp_path_info *pi1; struct bgp_path_info *pi1;
struct bgp_path_info *pi2; struct bgp_path_info *pi2;
struct bgp_path_info *nextpi = NULL; struct bgp_path_info *nextpi = NULL;
int paths_eq, do_mpath, debug; int paths_eq, do_mpath;
bool debug;
struct list mp_list; struct list mp_list;
char pfx_buf[PREFIX2STR_BUFFER] = {}; char pfx_buf[PREFIX2STR_BUFFER] = {};
char path_buf[PATH_ADDPATH_STR_BUFFER]; char path_buf[PATH_ADDPATH_STR_BUFFER];

View File

@ -914,7 +914,7 @@ extern void bgp_path_info_add_with_caller(const char *caller,
extern void bgp_aggregate_free(struct bgp_aggregate *aggregate); extern void bgp_aggregate_free(struct bgp_aggregate *aggregate);
extern int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new, extern int bgp_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,
struct bgp_maxpaths_cfg *mpath_cfg, int debug, struct bgp_maxpaths_cfg *mpath_cfg, bool debug,
char *pfx_buf, afi_t afi, safi_t safi, char *pfx_buf, afi_t afi, safi_t safi,
enum bgp_path_selection_reason *reason); enum bgp_path_selection_reason *reason);
#define bgp_path_info_add(A, B) \ #define bgp_path_info_add(A, B) \