proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-30 21:28:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15467 from donaldsharp/bgp_best_selection_cleanup

Browse Source 
Bgp best selection cleanup
This commit is contained in:
Donatas Abraitis 2024-03-04 13:35:35 +02:00 committed by GitHub
commit c256a9a40a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
bgpd/bgp_route.c
View File

@ -572,6 +572,11 @@ void bgp_path_info_path_with_addpath_rx_str(struct bgp_path_info *pi, char *buf,
{ {
struct peer *peer; struct peer *peer;
if (!pi) {
snprintf(buf, buf_len, "NONE");
return;
}
if (pi->sub_type == BGP_ROUTE_IMPORTED && if (pi->sub_type == BGP_ROUTE_IMPORTED &&
bgp_get_imported_bpi_ultimate(pi)) bgp_get_imported_bpi_ultimate(pi))
peer = bgp_get_imported_bpi_ultimate(pi)->peer; peer = bgp_get_imported_bpi_ultimate(pi)->peer;
@ -2777,41 +2782,35 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
} }
new_select = pi1; new_select = pi1;
if (pi1->next) {
for (pi2 = pi1->next; pi2; pi2 = pi2->next) { for (pi2 = pi1->next; pi2; pi2 = pi2->next) {
if (CHECK_FLAG(pi2->flags, if (CHECK_FLAG(pi2->flags, BGP_PATH_DMED_CHECK))
BGP_PATH_DMED_CHECK))
continue; continue;
if (BGP_PATH_HOLDDOWN(pi2)) if (BGP_PATH_HOLDDOWN(pi2))
continue; continue;
if (pi2->peer != bgp->peer_self && if (pi2->peer != bgp->peer_self &&
!CHECK_FLAG(pi2->peer->sflags, !CHECK_FLAG(pi2->peer->sflags,
PEER_STATUS_NSF_WAIT) && PEER_STATUS_NSF_WAIT) &&
!peer_established( !peer_established(pi2->peer->connection))
pi2->peer->connection))
continue; continue;
if (!aspath_cmp_left(pi1->attr->aspath, if (!aspath_cmp_left(pi1->attr->aspath,
pi2->attr->aspath) pi2->attr->aspath) &&
&& !aspath_cmp_left_confed( !aspath_cmp_left_confed(pi1->attr->aspath,
pi1->attr->aspath,
pi2->attr->aspath)) pi2->attr->aspath))
continue; continue;
if (bgp_path_info_cmp( if (bgp_path_info_cmp(bgp, pi2, new_select,
bgp, pi2, new_select, &paths_eq, mpath_cfg,
&paths_eq, mpath_cfg, debug, debug, pfx_buf, afi, safi,
pfx_buf, afi, safi,
&dest->reason)) { &dest->reason)) {
bgp_path_info_unset_flag( bgp_path_info_unset_flag(dest,
dest, new_select, new_select,
BGP_PATH_DMED_SELECTED); BGP_PATH_DMED_SELECTED);
new_select = pi2; new_select = pi2;
} }
bgp_path_info_set_flag( bgp_path_info_set_flag(dest, pi2,
dest, pi2, BGP_PATH_DMED_CHECK); BGP_PATH_DMED_CHECK);
}
} }
bgp_path_info_set_flag(dest, new_select, bgp_path_info_set_flag(dest, new_select,
BGP_PATH_DMED_CHECK); BGP_PATH_DMED_CHECK);
@ -2872,9 +2871,10 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
continue; continue;
} }
if (CHECK_FLAG(bgp->flags, BGP_FLAG_DETERMINISTIC_MED)
&& (!CHECK_FLAG(pi->flags, BGP_PATH_DMED_SELECTED))) {
bgp_path_info_unset_flag(dest, pi, BGP_PATH_DMED_CHECK); bgp_path_info_unset_flag(dest, pi, BGP_PATH_DMED_CHECK);
if (CHECK_FLAG(bgp->flags, BGP_FLAG_DETERMINISTIC_MED) &&
(!CHECK_FLAG(pi->flags, BGP_PATH_DMED_SELECTED))) {
if (debug) if (debug)
zlog_debug("%s: %pBD(%s) pi %s dmed", __func__, zlog_debug("%s: %pBD(%s) pi %s dmed", __func__,
dest, bgp->name_pretty, dest, bgp->name_pretty,
@ -2882,8 +2882,6 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
continue; continue;
} }
bgp_path_info_unset_flag(dest, pi, BGP_PATH_DMED_CHECK);
reason = dest->reason; reason = dest->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, debug, pfx_buf, afi, safi,
@ -2900,11 +2898,8 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
* qualify as multipaths * qualify as multipaths
*/ */
if (debug) { if (debug) {
if (new_select) bgp_path_info_path_with_addpath_rx_str(new_select, path_buf,
bgp_path_info_path_with_addpath_rx_str( sizeof(path_buf));
new_select, path_buf, sizeof(path_buf));
else
snprintf(path_buf, sizeof(path_buf), "NONE");
zlog_debug( zlog_debug(
"%pBD(%s): After path selection, newbest is %s oldbest was %s", "%pBD(%s): After path selection, newbest is %s oldbest was %s",
dest, bgp->name_pretty, path_buf, dest, bgp->name_pretty, path_buf,
@ -2912,9 +2907,7 @@ void bgp_best_selection(struct bgp *bgp, struct bgp_dest *dest,
} }
if (do_mpath && new_select) { if (do_mpath && new_select) {
for (pi = bgp_dest_get_bgp_path_info(dest); for (pi = bgp_dest_get_bgp_path_info(dest); pi; pi = pi->next) {
(pi != NULL) && (nextpi = pi->next, 1); pi = nextpi) {
if (debug) if (debug)
bgp_path_info_path_with_addpath_rx_str( bgp_path_info_path_with_addpath_rx_str(
pi, path_buf, sizeof(path_buf)); pi, path_buf, sizeof(path_buf));