Skip to content

W
White Rabbit Switch - Software
Commit 82f4d97f authored by Michal Wasiak's avatar Michal Wasiak Committed by Adam Wujek
Browse files
Options

snmp/bridge_mib: update dot1qFdbTable (count htab not vlans) 

Signed-off-by: 's avatarMichal Wasiak <michal.wasiak@gmail.com>
parent 0fab728d
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
userspace/snmpd/bridge_mib/dot1qFdbTable/dot1qFdbTable_data_access.c
View file @ 82f4d97f
...@@ -217,31 +217,31 @@ dot1qFdbTable_container_load(netsnmp_container *container) ...@@ -217,31 +217,31 @@ dot1qFdbTable_container_load(netsnmp_container *container)
*/ */
u_long dot1qFdbId = 0; u_long dot1qFdbId = 0;
struct rtu_vlan_table_entry vlan_tab_local[NUM_VLANS]; struct rtu_filtering_entry rtu_htab_local[RTU_BUCKETS * HTAB_ENTRIES];
int vlans_in_fids_counters[NUM_VLANS]; int entries_per_fid_table[NUM_VLANS];
u_long i; u_long i;
int read_entries;
DEBUGMSGTL(("verbose:dot1qFdbTable:dot1qFdbTable_container_load","called\n")); DEBUGMSGTL(("verbose:dot1qFdbTable:dot1qFdbTable_container_load","called\n"));
if (0 != shmem_rtu_read_vlans(vlan_tab_local)) { memset(entries_per_fid_table, 0, sizeof(entries_per_fid_table) * sizeof(int));
if (0 != shmem_rtu_read_htab(rtu_htab_local, &read_entries)) {
return MFD_RESOURCE_UNAVAILABLE; return MFD_RESOURCE_UNAVAILABLE;
} }
memset(vlans_in_fids_counters, 0, NUM_VLANS*sizeof(int)); /* Count number of entries per fid */
/* Count number of vlans per fid */ for (i = 0; i < read_entries; i++) {
for (i = 0; i < NUM_VLANS; i++) { if (rtu_htab_local[i].dynamic != RTU_ENTRY_TYPE_DYNAMIC) {
/* skip empty entires */ /* count only dynamic entries */
if ((vlan_tab_local[i].drop != 0) continue;
&& (vlan_tab_local[i].port_mask == 0x0)) }
continue; entries_per_fid_table[rtu_htab_local[i].fid]++;
vlans_in_fids_counters[vlan_tab_local[i].fid]++;
} }
for (dot1qFdbId = 0; dot1qFdbId < NUM_VLANS; dot1qFdbId++) { for (dot1qFdbId = 0; dot1qFdbId < NUM_VLANS; dot1qFdbId++) {
if (vlans_in_fids_counters[dot1qFdbId] == 0) { if (entries_per_fid_table[dot1qFdbId] == 0) {
/* Skip fids with no vlans */ /* Skip fids with no vlans */
continue; continue;
} }
...@@ -267,7 +267,7 @@ dot1qFdbTable_container_load(netsnmp_container *container) ...@@ -267,7 +267,7 @@ dot1qFdbTable_container_load(netsnmp_container *container)
* setup/save data for dot1qFdbDynamicCount * setup/save data for dot1qFdbDynamicCount
* dot1qFdbDynamicCount(2)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h * dot1qFdbDynamicCount(2)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
*/ */
rowreq_ctx->data.dot1qFdbDynamicCount = vlans_in_fids_counters[dot1qFdbId]; rowreq_ctx->data.dot1qFdbDynamicCount = entries_per_fid_table[dot1qFdbId];
/* /*
* insert into table container * insert into table container
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment