bgpd: fix evpn attributes being dropped on input

Tuetuopay · Tuetuopay · commit 13136e9bdffd · 2025-03-17T15:08:15.000+01:00
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: 6e076ba ("bgpd: Fix for ain->attr corruption during path update")
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
@@ -5165,7 +5165,9 @@ 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
@@ -14,9 +14,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

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ router bgp 64000`
`14`	`14`	`!`
`15`	`15`	`address-family l2vpn evpn`
`16`	`16`	`neighbor 10.0.0.2 activate`
`17`		`- ! workaround for now, as frr drops some evpn attributes like gw-ip if soft`
`18`		`- ! reconf is not enabled for inbound routes`
`19`		`- neighbor 10.0.0.2 soft-reconfiguration inbound`
`20`	`17`	`!`
`21`	`18`	`advertise-all-vni`
`22`	`19`	`exit-address-family`