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

zebra: Fix MAC counts for EVPN

Browse Source 
MAC entries are internally created for purposes such as when a local
neighbor is learnt but the MAC itself is not yet learnt. Such MACs are
not "real", so ensure they are not counted for UI output.

Signed-off-by: Vivek Venkatraman <vivek@cumulusnetworks.com>

Ticket: CM-17991
Reviewed By: None
Testing Done: Manual, evpn-smoke
This commit is contained in:
vivek 2017-10-04 22:30:53 -07:00 committed by Donald Sharp
parent 2853fed67a
commit 790f8dc572
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zebra/zebra_vxlan.c
View File

@ -146,6 +146,33 @@ static void zvni_deref_ip2mac(zebra_vni_t *zvni, zebra_mac_t *mac,
/* Private functions */ /* Private functions */
/*
* Return number of valid MACs in a VNI's MAC hash table - all
* remote MACs and non-internal (auto) local MACs count.
*/
static u_int32_t num_valid_macs(zebra_vni_t *zvni)
{
unsigned int i;
u_int32_t num_macs = 0;
struct hash *hash;
struct hash_backet *hb;
zebra_mac_t *mac;
hash = zvni->mac_table;
if (!hash)
return num_macs;
for (i = 0; i < hash->size; i++) {
for (hb = hash->index[i]; hb; hb = hb->next) {
mac = (zebra_mac_t *)hb->data;
if (CHECK_FLAG(mac->flags, ZEBRA_MAC_REMOTE)
|| !CHECK_FLAG(mac->flags, ZEBRA_MAC_AUTO))
num_macs++;
}
}
return num_macs;
}
static int advertise_gw_macip_enabled(zebra_vni_t *zvni) static int advertise_gw_macip_enabled(zebra_vni_t *zvni)
{ {
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
@ -543,7 +570,7 @@ static void zvni_print_mac_hash_all_vni(struct hash_backet *backet, void *ctxt)
/*We are iterating over a new VNI, set the count to 0*/ /*We are iterating over a new VNI, set the count to 0*/
wctx->count = 0; wctx->count = 0;
num_macs = hashcount(zvni->mac_table); num_macs = num_valid_macs(zvni);
if (!num_macs) if (!num_macs)
return; return;
@ -602,7 +629,7 @@ static void zvni_print(zebra_vni_t *zvni, void **ctxt)
vty_out(vty, " VxLAN interface: unknown\n"); vty_out(vty, " VxLAN interface: unknown\n");
return; return;
} }
num_macs = hashcount(zvni->mac_table); num_macs = num_valid_macs(zvni);
num_neigh = hashcount(zvni->neigh_table); num_neigh = hashcount(zvni->neigh_table);
if (json == NULL) if (json == NULL)
vty_out(vty, " VxLAN interface: %s ifIndex: %u VTEP IP: %s\n", vty_out(vty, " VxLAN interface: %s ifIndex: %u VTEP IP: %s\n",
@ -684,7 +711,7 @@ static void zvni_print_hash(struct hash_backet *backet, void *ctxt[])
zvtep = zvtep->next; zvtep = zvtep->next;
} }
num_macs = hashcount(zvni->mac_table); num_macs = num_valid_macs(zvni);
num_neigh = hashcount(zvni->neigh_table); num_neigh = hashcount(zvni->neigh_table);
if (json == NULL) if (json == NULL)
vty_out(vty, "%-10u %-21s %-15s %-8u %-8u %-15u\n", zvni->vni, vty_out(vty, "%-10u %-21s %-15s %-8u %-8u %-15u\n", zvni->vni,
@ -2534,7 +2561,7 @@ void zebra_vxlan_print_macs_vni(struct vty *vty, struct zebra_vrf *zvrf,
vty_out(vty, "%% VNI %u does not exist\n", vni); vty_out(vty, "%% VNI %u does not exist\n", vni);
return; return;
} }
num_macs = hashcount(zvni->mac_table); num_macs = num_valid_macs(zvni);
if (!num_macs) if (!num_macs)
return; return;
@ -2676,7 +2703,7 @@ void zebra_vxlan_print_macs_vni_vtep(struct vty *vty, struct zebra_vrf *zvrf,
vty_out(vty, "%% VNI %u does not exist\n", vni); vty_out(vty, "%% VNI %u does not exist\n", vni);
return; return;
} }
num_macs = hashcount(zvni->mac_table); num_macs = num_valid_macs(zvni);
if (!num_macs) if (!num_macs)
return; return;