mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-06 02:46:26 +00:00
bgpd: fix setting BGP_PATH_VALID flag in leak_update
(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:
parent
f99b8a312c
commit
659251db5b
@ -805,7 +805,6 @@ static bool leak_update_nexthop_valid(struct bgp *bgp, struct bgp_dest *bn,
|
||||
*/
|
||||
if (bgp->srv6_enabled &&
|
||||
(!new_attr->srv6_l3vpn && !new_attr->srv6_vpn)) {
|
||||
bgp_path_info_unset_flag(bn, bpi, BGP_PATH_VALID);
|
||||
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__,
|
||||
(nh_valid ? "" : "not "), bgp_nexthop->name_pretty);
|
||||
|
||||
if (nh_valid)
|
||||
bgp_path_info_set_flag(bn, bpi, BGP_PATH_VALID);
|
||||
|
||||
return nh_valid;
|
||||
}
|
||||
|
||||
@ -964,8 +960,11 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
|
||||
if (nexthop_self_flag)
|
||||
bgp_path_info_set_flag(bn, bpi, BGP_PATH_ANNC_NH_SELF);
|
||||
|
||||
leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi,
|
||||
source_bpi, bpi, p, debug);
|
||||
if (leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi,
|
||||
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. */
|
||||
bgp_aggregate_increment(bgp, p, bpi, afi, safi);
|
||||
@ -1032,8 +1031,11 @@ leak_update(struct bgp *bgp, /* destination bgp instance */
|
||||
if (nexthop_orig)
|
||||
new->extra->nexthop_orig = *nexthop_orig;
|
||||
|
||||
leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi, source_bpi, new,
|
||||
p, debug);
|
||||
if (leak_update_nexthop_valid(bgp, bn, new_attr, afi, safi, source_bpi,
|
||||
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_path_info_add(bn, new);
|
||||
|
Loading…
Reference in New Issue
Block a user