proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-06 05:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14445 from donaldsharp/use_my_cabbage

Browse Source 
couple bgp coverity issues
This commit is contained in:
Donatas Abraitis 2023-09-20 09:58:13 +03:00 committed by GitHub
commit 4be71e900c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_evpn.c
View File

@ -1722,8 +1722,8 @@ static void bgp_evpn_get_sync_info(struct bgp *bgp, esi_t *esi,
continue; continue;
} }
if (bgp_evpn_path_info_cmp(bgp, tmp_pi, if (bgp_evpn_path_info_cmp(bgp, tmp_pi, second_best_path,
second_best_path, &paths_eq)) &paths_eq, false))
second_best_path = tmp_pi; second_best_path = tmp_pi;
} }

3
bgpd/bgp_mplsvpn.c
View File

@ -1179,12 +1179,13 @@ leak_update(struct bgp *to_bgp, struct bgp_dest *bn,
/* Process change. */ /* Process change. */
bgp_aggregate_increment(to_bgp, p, bpi, afi, safi); bgp_aggregate_increment(to_bgp, p, bpi, afi, safi);
bgp_process(to_bgp, bn, afi, safi); bgp_process(to_bgp, bn, afi, safi);
bgp_dest_unlock_node(bn);
if (debug) if (debug)
zlog_debug("%s: ->%s: %pBD Found route, changed attr", zlog_debug("%s: ->%s: %pBD Found route, changed attr",
__func__, to_bgp->name_pretty, bn); __func__, to_bgp->name_pretty, bn);
bgp_dest_unlock_node(bn);
return bpi; return bpi;
} }

4
bgpd/bgp_route.c
View File

@ -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, 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; enum bgp_path_selection_reason reason;
char pfx_buf[PREFIX2STR_BUFFER] = {}; char pfx_buf[PREFIX2STR_BUFFER] = {};
bool debug = false;
if (debug) if (debug)
prefix2str(bgp_dest_get_prefix(new->net), pfx_buf, prefix2str(bgp_dest_get_prefix(new->net), pfx_buf,

3
bgpd/bgp_route.h
View File

@ -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, uint8_t type, uint8_t stype,
struct attr *attr, struct bgp_dest *dest); struct attr *attr, struct bgp_dest *dest);
extern int bgp_evpn_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new, 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, extern void bgp_aggregate_toggle_suppressed(struct bgp_aggregate *aggregate,
struct bgp *bgp, struct bgp *bgp,
const struct prefix *p, afi_t afi, const struct prefix *p, afi_t afi,