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

bgpd: fix setting BGP_PATH_VALID flag in leak_update

Browse Source 
(Un)set the BGP_PATH_VALID flag appropriately in the leak_update
function.

Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Louis Scalbert 2022-04-28 17:00:50 +02:00
parent f99b8a312c
commit 659251db5b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_mplsvpn.c
View File

@ -805,7 +805,6 @@ static bool leak_update_nexthop_valid(struct bgp *bgp, struct bgp_dest *bn,
*/ */
if (bgp->srv6_enabled && if (bgp->srv6_enabled &&
(!new_attr->srv6_l3vpn && !new_attr->srv6_vpn)) { (!new_attr->srv6_l3vpn && !new_attr->srv6_vpn)) {
bgp_path_info_unset_flag(bn, bpi, BGP_PATH_VALID);
nh_valid = false; nh_valid = false;
} }
@ -813,9 +812,6 @@ static bool leak_update_nexthop_valid(struct bgp *bgp, struct bgp_dest *bn,
zlog_debug("%s: nexthop is %svalid (in vrf %s)", __func__, zlog_debug("%s: nexthop is %svalid (in vrf %s)", __func__,
(nh_valid ? "" : "not "), bgp_nexthop->name_pretty); (nh_valid ? "" : "not "), bgp_nexthop->name_pretty);
if (nh_valid)
bgp_path_info_set_flag(bn, bpi, BGP_PATH_VALID);
return nh_valid; return nh_valid;
} }
@ -964,8 +960,11 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
if (nexthop_self_flag) if (nexthop_self_flag)
bgp_path_info_set_flag(bn, bpi, BGP_PATH_ANNC_NH_SELF); bgp_path_info_set_flag(bn, bpi, BGP_PATH_ANNC_NH_SELF);
leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi, if (leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi,
source_bpi, bpi, p, debug); source_bpi, bpi, p, debug))
bgp_path_info_set_flag(bn, bpi, BGP_PATH_VALID);
else
bgp_path_info_unset_flag(bn, bpi, BGP_PATH_VALID);
/* Process change. */ /* Process change. */
bgp_aggregate_increment(bgp, p, bpi, afi, safi); bgp_aggregate_increment(bgp, p, bpi, afi, safi);
@ -1032,8 +1031,11 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
if (nexthop_orig) if (nexthop_orig)
new->extra->nexthop_orig = *nexthop_orig; new->extra->nexthop_orig = *nexthop_orig;
leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi, source_bpi, new, if (leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi, source_bpi,
p, debug); new, p, debug))
bgp_path_info_set_flag(bn, new, BGP_PATH_VALID);
else
bgp_path_info_unset_flag(bn, new, BGP_PATH_VALID);
bgp_aggregate_increment(bgp, p, new, afi, safi); bgp_aggregate_increment(bgp, p, new, afi, safi);
bgp_path_info_add(bn, new); bgp_path_info_add(bn, new);