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

Merge pull request #6375 from adharkar/frr-master-l3vni_label

Browse Source 
bgpd: EVPN RT-2 advertised with 2 labels for prefix-routes-only config
This commit is contained in:
Russ White 2020-05-26 12:14:16 -04:00 committed by GitHub
commit eeec40ba69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bgpd/bgp_evpn.c
View File

@ -5824,9 +5824,31 @@ int bgp_evpn_local_l3vni_add(vni_t l3vni, vrf_id_t vrf_id,
is_anycast_mac ? "Enable" : "Disable");
}
/* set the right filter - are we using l3vni only for prefix routes? */
if (filter)
if (filter) {
SET_FLAG(bgp_vrf->vrf_flags, BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY);
/*
* VNI_FLAG_USE_TWO_LABELS flag for linked L2VNIs should not be
* set before linking vrf to L3VNI. Thus, no need to clear
* that explicitly.
*/
} else {
UNSET_FLAG(bgp_vrf->vrf_flags,
BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY);
for (ALL_LIST_ELEMENTS_RO(bgp_vrf->l2vnis, node, vpn)) {
if (!CHECK_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS)) {
/*
* If we are flapping VNI_FLAG_USE_TWO_LABELS
* flag, update all MACIP routes in this VNI
*/
SET_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS);
update_all_type2_routes(bgp_evpn, vpn);
}
}
}
/* Map auto derive or configured RTs */
if (!CHECK_FLAG(bgp_vrf->vrf_flags, BGP_VRF_IMPORT_RT_CFGD))
evpn_auto_rt_import_add_for_vrf(bgp_vrf);

8
bgpd/bgp_evpn_private.h
View File

@ -270,8 +270,12 @@ static inline void bgpevpn_link_to_l3vni(struct bgpevpn *vpn)
vpn->bgp_vrf = bgp_lock(bgp_vrf);
listnode_add_sort(bgp_vrf->l2vnis, vpn);
/* check if we are advertising two labels for this vpn */
if (!CHECK_FLAG(bgp_vrf->vrf_flags, BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY))
/*
* If L3VNI is configured,
* check if we are advertising two labels for this vpn
*/
if (bgp_vrf->l3vni &&
!CHECK_FLAG(bgp_vrf->vrf_flags, BGP_VRF_L3VNI_PREFIX_ROUTES_ONLY))
SET_FLAG(vpn->flags, VNI_FLAG_USE_TWO_LABELS);
}