proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-23 19:27:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18132 from opensourcerouting/fix/backport_82d28f137aed2e60380807a302e2b312408eff6e_10.3

Browse Source 
Cid 1636504 (backport)
This commit is contained in:
Jafar Al-Gharaibeh 2025-02-12 22:26:21 -06:00 committed by GitHub
commit e9e93e91fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bgpd/bgp_evpn_mh.c
View File

@ -1198,7 +1198,7 @@ int bgp_evpn_type1_route_process(struct peer *peer, afi_t afi, safi_t safi,
struct prefix_rd prd; struct prefix_rd prd;
esi_t esi; esi_t esi;
uint32_t eth_tag; uint32_t eth_tag;
mpls_label_t label; mpls_label_t label[BGP_MAX_LABELS] = {};
struct in_addr vtep_ip; struct in_addr vtep_ip;
struct prefix_evpn p; struct prefix_evpn p;
@ -1224,7 +1224,7 @@ int bgp_evpn_type1_route_process(struct peer *peer, afi_t afi, safi_t safi,
eth_tag = ntohl(eth_tag); eth_tag = ntohl(eth_tag);
pfx += EVPN_ETH_TAG_BYTES; pfx += EVPN_ETH_TAG_BYTES;
memcpy(&label, pfx, BGP_LABEL_BYTES); memcpy(&label[0], pfx, BGP_LABEL_BYTES);
/* EAD route prefix doesn't include the nexthop in the global /* EAD route prefix doesn't include the nexthop in the global
* table * table
@ -1233,12 +1233,11 @@ int bgp_evpn_type1_route_process(struct peer *peer, afi_t afi, safi_t safi,
build_evpn_type1_prefix(&p, eth_tag, &esi, vtep_ip); build_evpn_type1_prefix(&p, eth_tag, &esi, vtep_ip);
/* Process the route. */ /* Process the route. */
if (attr) { if (attr) {
bgp_update(peer, (struct prefix *)&p, addpath_id, attr, afi, bgp_update(peer, (struct prefix *)&p, addpath_id, attr, afi, safi, ZEBRA_ROUTE_BGP,
safi, ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, &prd, NULL, BGP_ROUTE_NORMAL, &prd, &label[0], 1, 0, NULL);
0, 0, NULL);
} else { } else {
bgp_withdraw(peer, (struct prefix *)&p, addpath_id, afi, safi, bgp_withdraw(peer, (struct prefix *)&p, addpath_id, afi, safi, ZEBRA_ROUTE_BGP,
ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, &prd, NULL, 0); BGP_ROUTE_NORMAL, &prd, &label[0], 1);
} }
return 0; return 0;
} }