proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 08:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9236 from AnuradhaKaruppiah/v6-nh-rmac

Browse Source 
zebra: use a separate dummy prefix for referencing v6 nexthops
This commit is contained in:
Sri Mohana Singamsetty 2021-08-10 08:20:55 -07:00 committed by GitHub
commit dd4c59d79a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zebra/zebra_evpn_mh.c
View File

@ -3929,17 +3929,20 @@ void zebra_evpn_proc_remote_nh(ZAPI_HANDLER_ARGS)
dummy_prefix.family = AF_EVPN;
dummy_prefix.prefixlen = (sizeof(struct evpn_addr) * 8);
dummy_prefix.prefix.route_type = 1; /* XXX - fixup to type-1 def */
dummy_prefix.prefix.ead_addr.ip.ipa_type = nh.ipa_type;
if (hdr->command == ZEBRA_EVPN_REMOTE_NH_ADD) {
stream_get(&rmac, s, sizeof(rmac));
if (IS_ZEBRA_DEBUG_EVPN_MH_ES)
zlog_debug("evpn remote nh %d %pIA rmac %pEA add",
vrf_id, &nh, &rmac);
zlog_debug(
"evpn remote nh %d %pIA rmac %pEA add pfx %pFX",
vrf_id, &nh, &rmac, &dummy_prefix);
zebra_rib_queue_evpn_route_add(vrf_id, &rmac, &nh,
(struct prefix *)&dummy_prefix);
} else {
if (IS_ZEBRA_DEBUG_EVPN_MH_ES)
zlog_debug("evpn remote nh %d %pIA del", vrf_id, &nh);
zlog_debug("evpn remote nh %d %pIA del pfx %pFX",
vrf_id, &nh, &dummy_prefix);
zebra_rib_queue_evpn_route_del(vrf_id, &nh,
(struct prefix *)&dummy_prefix);
}

23
zebra/zebra_vxlan.c
View File

@ -150,9 +150,28 @@ static int host_rb_entry_compare(const struct host_rb_entry *hle1,
return memcmp(&hle1->p.u.prefix6, &hle2->p.u.prefix6,
IPV6_MAX_BYTELEN);
} else if (hle1->p.family == AF_EVPN) {
/* a single dummy prefix of route_type BGP_EVPN_AD_ROUTE is
* used for all nexthops associated with a non-zero ESI
uint8_t family1;
uint8_t family2;
/* two (v4/v6) dummy prefixes of route_type BGP_EVPN_AD_ROUTE
* are used for all nexthops associated with a non-zero ESI
*/
family1 = is_evpn_prefix_ipaddr_v4(
(const struct prefix_evpn *)&hle1->p)
? AF_INET
: AF_INET6;
family2 = is_evpn_prefix_ipaddr_v4(
(const struct prefix_evpn *)&hle2->p)
? AF_INET
: AF_INET6;
if (family1 < family2)
return -1;
if (family1 > family2)
return 1;
return 0;
} else {
zlog_debug("%s: Unexpected family type: %d", __func__,