diff options
| author | Tuetuopay <tuetuopay@me.com> | 2025-03-17 15:08:15 +0100 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2025-03-23 10:40:50 +0000 |
| commit | a095dd659d1c09547857d90a74ff9e203280eef8 (patch) | |
| tree | 83d673bf5951ddd179634885ead6079cbeb87911 | |
| parent | 1d957df8801ac006f3b6cc545b13f2c8e9d99c70 (diff) | |
bgpd: fix evpn attributes being dropped on inputmergify/bp/stable/10.3/pr-18378
All assignments of the EVPN attributes (ESI and Gateway IP) are gated
behind the peer being set up for inbound soft-reconfiguration.
There are no actual reasons for this limitation, so let's perform the
EVPN attribute assignment no matter what when soft reconfiguration is
not enabled.
Fixes: 6e076ba5231 ("bgpd: Fix for ain->attr corruption during path update")
Signed-off-by: Tuetuopay <tuetuopay@me.com>
(cherry picked from commit 7320659f78cbe86dd983d5101831120fc14583d7)
| -rw-r--r-- | bgpd/bgp_route.c | 3 | ||||
| -rw-r--r-- | tests/topotests/bgp_evpn_route_map_set/r2/frr.conf | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 5ec122d2a9..8201e90cc3 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -5135,7 +5135,8 @@ void bgp_update(struct peer *peer, const struct prefix *p, uint32_t addpath_id, * attr->evpn_overlay with evpn directly. Instead memcpy * evpn to new_atr.evpn_overlay before it is interned. */ - if (soft_reconfig && evpn && afi == AFI_L2VPN) { + if (evpn && afi == AFI_L2VPN && + (soft_reconfig || !CHECK_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SOFT_RECONFIG))) { bgp_attr_set_evpn_overlay(&new_attr, evpn); p_evpn = NULL; } diff --git a/tests/topotests/bgp_evpn_route_map_set/r2/frr.conf b/tests/topotests/bgp_evpn_route_map_set/r2/frr.conf index 754b696bfd..2a15998420 100644 --- a/tests/topotests/bgp_evpn_route_map_set/r2/frr.conf +++ b/tests/topotests/bgp_evpn_route_map_set/r2/frr.conf @@ -12,9 +12,6 @@ router bgp 64000 ! address-family l2vpn evpn neighbor 10.0.0.2 activate - ! workaround for now, as frr drops some evpn attributes like gw-ip if soft - ! reconf is not enabled for inbound routes - neighbor 10.0.0.2 soft-reconfiguration inbound ! advertise-all-vni exit-address-family |