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

Merge pull request #7637 from AnuradhaKaruppiah/evpn-pim-fixes

Browse Source 
evpn-pim: cleanup and display fixes
This commit is contained in:
Patrick Ruddy 2020-12-15 17:36:24 +00:00 committed by GitHub
commit a119a429e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pimd/pim_vty.c
View File

@ -275,6 +275,13 @@ int pim_interface_config_write(struct vty *vty)
continue; continue;
FOR_ALL_INTERFACES (pim->vrf, ifp) { FOR_ALL_INTERFACES (pim->vrf, ifp) {
/* pim is enabled internally/implicitly on the vxlan
* termination device ipmr-lo. skip displaying that
* config to avoid confusion
*/
if (pim_vxlan_is_term_dev_cfg(pim, ifp))
continue;
/* IF name */ /* IF name */
if (vrf->vrf_id == VRF_DEFAULT) if (vrf->vrf_id == VRF_DEFAULT)
vty_frame(vty, "interface %s\n", ifp->name); vty_frame(vty, "interface %s\n", ifp->name);

46
zebra/zebra_vxlan.c
View File

@ -116,7 +116,7 @@ static void zebra_vxlan_sg_deref(struct in_addr local_vtep_ip,
struct in_addr mcast_grp); struct in_addr mcast_grp);
static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip, static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
struct in_addr mcast_grp); struct in_addr mcast_grp);
static void zebra_vxlan_sg_cleanup(struct hash_bucket *bucket, void *arg); static void zebra_vxlan_cleanup_sg_table(struct zebra_vrf *zvrf);
bool zebra_evpn_do_dup_addr_detect(struct zebra_vrf *zvrf) bool zebra_evpn_do_dup_addr_detect(struct zebra_vrf *zvrf)
{ {
@ -5784,7 +5784,7 @@ void zebra_vxlan_cleanup_tables(struct zebra_vrf *zvrf)
if (!zvrf) if (!zvrf)
return; return;
hash_iterate(zvrf->evpn_table, zebra_evpn_vxlan_cleanup_all, zvrf); hash_iterate(zvrf->evpn_table, zebra_evpn_vxlan_cleanup_all, zvrf);
hash_iterate(zvrf->vxlan_sg_table, zebra_vxlan_sg_cleanup, NULL); zebra_vxlan_cleanup_sg_table(zvrf);
if (zvrf == evpn_zvrf) if (zvrf == evpn_zvrf)
zebra_evpn_es_cleanup(); zebra_evpn_es_cleanup();
@ -5797,6 +5797,11 @@ void zebra_vxlan_close_tables(struct zebra_vrf *zvrf)
return; return;
hash_iterate(zvrf->evpn_table, zebra_evpn_vxlan_cleanup_all, zvrf); hash_iterate(zvrf->evpn_table, zebra_evpn_vxlan_cleanup_all, zvrf);
hash_free(zvrf->evpn_table); hash_free(zvrf->evpn_table);
if (zvrf->vxlan_sg_table) {
zebra_vxlan_cleanup_sg_table(zvrf);
hash_free(zvrf->vxlan_sg_table);
zvrf->vxlan_sg_table = NULL;
}
} }
/* init the l3vni table */ /* init the l3vni table */
@ -6045,6 +6050,30 @@ static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
zebra_vxlan_sg_do_ref(zvrf, local_vtep_ip, mcast_grp); zebra_vxlan_sg_do_ref(zvrf, local_vtep_ip, mcast_grp);
} }
static void zebra_vxlan_xg_pre_cleanup(struct hash_bucket *backet, void *arg)
{
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;
/* increment the ref count against (*,G) to prevent them from being
* deleted
*/
if (vxlan_sg->sg.src.s_addr == INADDR_ANY)
++vxlan_sg->ref_cnt;
}
static void zebra_vxlan_xg_post_cleanup(struct hash_bucket *backet, void *arg)
{
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;
/* decrement the dummy ref count against (*,G) to delete them */
if (vxlan_sg->sg.src.s_addr == INADDR_ANY) {
if (vxlan_sg->ref_cnt)
--vxlan_sg->ref_cnt;
if (!vxlan_sg->ref_cnt)
zebra_vxlan_sg_del(vxlan_sg);
}
}
static void zebra_vxlan_sg_cleanup(struct hash_bucket *backet, void *arg) static void zebra_vxlan_sg_cleanup(struct hash_bucket *backet, void *arg)
{ {
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data; zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;
@ -6052,6 +6081,19 @@ static void zebra_vxlan_sg_cleanup(struct hash_bucket *backet, void *arg)
zebra_vxlan_sg_del(vxlan_sg); zebra_vxlan_sg_del(vxlan_sg);
} }
static void zebra_vxlan_cleanup_sg_table(struct zebra_vrf *zvrf)
{
/* increment the ref count against (*,G) to prevent them from being
* deleted
*/
hash_iterate(zvrf->vxlan_sg_table, zebra_vxlan_xg_pre_cleanup, NULL);
hash_iterate(zvrf->vxlan_sg_table, zebra_vxlan_sg_cleanup, NULL);
/* decrement the dummy ref count against the XG entries */
hash_iterate(zvrf->vxlan_sg_table, zebra_vxlan_xg_post_cleanup, NULL);
}
static void zebra_vxlan_sg_replay_send(struct hash_bucket *backet, void *arg) static void zebra_vxlan_sg_replay_send(struct hash_bucket *backet, void *arg)
{ {
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data; zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;