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

Merge pull request #6013 from donaldsharp/bgp_reason_it

Browse Source 
bgpd: Fix certain code paths that reset reason code
This commit is contained in:
Donatas Abraitis 2020-03-18 10:37:02 +02:00 committed by GitHub
commit 974ac286f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_route.c
View File

@ -2107,6 +2107,7 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
if (debug) if (debug)
prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf)); prefix2str(&rn->p, pfx_buf, sizeof(pfx_buf));
rn->reason = bgp_path_selection_none;
/* bgp deterministic-med */ /* bgp deterministic-med */
new_select = NULL; new_select = NULL;
if (CHECK_FLAG(bgp->flags, BGP_FLAG_DETERMINISTIC_MED)) { if (CHECK_FLAG(bgp->flags, BGP_FLAG_DETERMINISTIC_MED)) {
@ -2186,6 +2187,8 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
new_select = NULL; new_select = NULL;
for (pi = bgp_node_get_bgp_path_info(rn); for (pi = bgp_node_get_bgp_path_info(rn);
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) { (pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
enum bgp_path_selection_reason reason;
if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED)) if (CHECK_FLAG(pi->flags, BGP_PATH_SELECTED))
old_select = pi; old_select = pi;
@ -2226,8 +2229,12 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_node *rn,
bgp_path_info_unset_flag(rn, pi, BGP_PATH_DMED_CHECK); bgp_path_info_unset_flag(rn, pi, BGP_PATH_DMED_CHECK);
reason = rn->reason;
if (bgp_path_info_cmp(bgp, pi, new_select, &paths_eq, mpath_cfg, if (bgp_path_info_cmp(bgp, pi, new_select, &paths_eq, mpath_cfg,
debug, pfx_buf, afi, safi, &rn->reason)) { debug, pfx_buf, afi, safi, &rn->reason)) {
if (new_select == NULL &&
reason != bgp_path_selection_none)
rn->reason = reason;
new_select = pi; new_select = pi;
} }
} }