mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-23 19:27:34 +00:00
Merge pull request #18132 from opensourcerouting/fix/backport_82d28f137aed2e60380807a302e2b312408eff6e_10.3
Cid 1636504 (backport)
This commit is contained in:
commit
e9e93e91fc
@ -1198,7 +1198,7 @@ int bgp_evpn_type1_route_process(struct peer *peer, afi_t afi, safi_t safi,
|
||||
struct prefix_rd prd;
|
||||
esi_t esi;
|
||||
uint32_t eth_tag;
|
||||
mpls_label_t label;
|
||||
mpls_label_t label[BGP_MAX_LABELS] = {};
|
||||
struct in_addr vtep_ip;
|
||||
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);
|
||||
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
|
||||
* 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);
|
||||
/* Process the route. */
|
||||
if (attr) {
|
||||
bgp_update(peer, (struct prefix *)&p, addpath_id, attr, afi,
|
||||
safi, ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, &prd, NULL,
|
||||
0, 0, NULL);
|
||||
bgp_update(peer, (struct prefix *)&p, addpath_id, attr, afi, safi, ZEBRA_ROUTE_BGP,
|
||||
BGP_ROUTE_NORMAL, &prd, &label[0], 1, 0, NULL);
|
||||
} else {
|
||||
bgp_withdraw(peer, (struct prefix *)&p, addpath_id, afi, safi,
|
||||
ZEBRA_ROUTE_BGP, BGP_ROUTE_NORMAL, &prd, NULL, 0);
|
||||
bgp_withdraw(peer, (struct prefix *)&p, addpath_id, afi, safi, ZEBRA_ROUTE_BGP,
|
||||
BGP_ROUTE_NORMAL, &prd, &label[0], 1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user