Skip to content

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

snmp/bridge_mib: update dot1qVlanCurrentTable 

Signed-off-by: 's avatarMichal Wasiak <michal.wasiak@gmail.com>
parent 6fecc497
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 264 deletions
userspace/snmpd/bridge_mib/Makefile
View file @ a879488d
......@@ -7,6 +7,7 @@ BRIDGE_DIRS= \
dot1qFdbTable \
dot1qPortVlanTable \
dot1qTpFdbTable \
dot1qVlanCurrentTable \
dot1qVlanStaticTable \
BRIDGE_INCLUDE_DIRS:=$(addsuffix /Makefile,$(BRIDGE_DIRS))
......
userspace/snmpd/bridge_mib/dot1qVlanCurrentTable/Makefile 0 → 100644
View file @ a879488d
BRIDGE_MIB_SRCS += \
dot1qVlanCurrentTable/dot1qVlanCurrentTable.c \
dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_get.c \
dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_set.c \
dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_access.c \
dot1qVlanCurrentTable/dot1qVlanCurrentTable_interface.c
userspace/snmpd/bridge_mib/dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_access.c
View file @ a879488d
......@@ -10,6 +10,9 @@
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
#include "wrsSnmp.h"
#include "snmp_shmem.h"
/* include our parent header */
#include "dot1qVlanCurrentTable.h"
......@@ -207,82 +210,71 @@ dot1qVlanCurrentTable_container_load(netsnmp_container *container)
dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx;
size_t count = 0;
/*
* temporary storage for index values
*/
/*
* dot1qVlanTimeMark(1)/TimeFilter/ASN_TIMETICKS/u_long(u_long)//l/a/w/e/r/d/h
*/
u_long dot1qVlanTimeMark;
/*
* dot1qVlanIndex(2)/VlanIndex/ASN_UNSIGNED/u_long(u_long)//l/a/w/e/r/d/H
*/
u_long dot1qVlanIndex;
struct rtu_vlan_table_entry vlan_tab_local[NUM_VLANS];
struct rtu_port_entry ports_tab_local[HAL_MAX_PORTS];
int rtu_nports_local;
uint32_t untag_mask = 0;
/*
* this example code is based on a data source that is a
* text file to be read and parsed.
*/
FILE *filep;
char line[MAX_LINE_SIZE];
int vlan_i;
int port_i;
u_long dot1qVlanTimeMark;
uint64_t agent_uptime_hs; /* in 100th of second */
uint64_t monotonic_now_hs; /* in 100th of second */
uint64_t creation_time_hs; /* in 100th of second */
uint64_t netsnmp_start_ts_monotonic_hs; /* in 100th of second */
struct timeval monotonic_now;
DEBUGMSGTL(("verbose:dot1qVlanCurrentTable:dot1qVlanCurrentTable_container_load","called\n"));
/*
***************************************************
*** START EXAMPLE CODE ***
***---------------------------------------------***/
/*
* open our data file.
*/
filep = fopen("/etc/dummy.conf", "r");
if(NULL == filep) {
return MFD_RESOURCE_UNAVAILABLE;
if (0 != shmem_rtu_read_vlans(vlan_tab_local)) {
snmp_log(LOG_ERR, "unable to get vlans info from RTU\n");
return MFD_RESOURCE_UNAVAILABLE;
}
if (shmem_rtu_read_ports(ports_tab_local, &rtu_nports_local)) {
snmp_log(LOG_ERR, "unable to get ports info from RTU\n");
return MFD_RESOURCE_UNAVAILABLE;
}
/* build a mask of untagged ports (needed for dot1qVlanCurrentUntaggedPorts) */
for (port_i = rtu_nports_local - 1; port_i >= 0; port_i--){
untag_mask <<= 1;
untag_mask |= ports_tab_local[port_i].untag & 1;
}
netsnmp_get_monotonic_clock(&monotonic_now);
/* Unfortunately netsnmp_get_agent_uptime also calls netsnmp_get_monotonic_clock,
* but there is no function to get the timestamp of a monotonic clock when
* the agest was started */
agent_uptime_hs = netsnmp_get_agent_uptime();
monotonic_now_hs = monotonic_now.tv_sec * (uint64_t)100 + monotonic_now.tv_usec / 10000;
netsnmp_start_ts_monotonic_hs = monotonic_now_hs - agent_uptime_hs;
/*
***---------------------------------------------***
*** END EXAMPLE CODE ***
***************************************************/
/*
* TODO:351:M: |-> Load/update data in the dot1qVlanCurrentTable container.
* |-> Load/update data in the dot1qVlanCurrentTable container.
* loop over your dot1qVlanCurrentTable data, allocate a rowreq context,
* set the index(es) [and data, optionally] and insert into
* the container.
*/
while( 1 ) {
/*
***************************************************
*** START EXAMPLE CODE ***
***---------------------------------------------***/
/*
* get a line (skip blank lines)
*/
do {
if (!fgets(line, sizeof(line), filep)) {
/* we're done */
fclose(filep);
filep = NULL;
}
} while (filep && (line[0] == '\n'));
/*
* check for end of data
*/
if(NULL == filep)
break;
/*
* parse line into variables
*/
/*
***---------------------------------------------***
*** END EXAMPLE CODE ***
***************************************************/
/*
* TODO:352:M: | |-> set indexes in new dot1qVlanCurrentTable rowreq context.
for (vlan_i = 0; vlan_i < NUM_VLANS; vlan_i++) {
/* skip empty entires */
if ((vlan_tab_local[vlan_i].drop != 0) && (vlan_tab_local[vlan_i].port_mask == 0x0)) {
continue;
}
creation_time_hs = vlan_tab_local[vlan_i].creation_time.tv_sec * (uint64_t)100
+ vlan_tab_local[vlan_i].creation_time.tv_usec / 10000;
if (netsnmp_start_ts_monotonic_hs > creation_time_hs) {
/* entry has alredy existed when SNMP agent started */
dot1qVlanTimeMark = 0;
} else {
dot1qVlanTimeMark = creation_time_hs - netsnmp_start_ts_monotonic_hs;
}
/*
* |-> set indexes in new dot1qVlanCurrentTable rowreq context.
* data context will be set from the param (unless NULL,
* in which case a new data context will be allocated)
*/
......@@ -293,7 +285,7 @@ dot1qVlanCurrentTable_container_load(netsnmp_container *container)
}
if(MFD_SUCCESS != dot1qVlanCurrentTable_indexes_set(rowreq_ctx
, dot1qVlanTimeMark
, dot1qVlanIndex
, vlan_i
)) {
snmp_log(LOG_ERR,"error setting index while loading "
"dot1qVlanCurrentTable data.\n");
......@@ -302,105 +294,60 @@ dot1qVlanCurrentTable_container_load(netsnmp_container *container)
}
/*
* TODO:352:r: | |-> populate dot1qVlanCurrentTable data context.
* |-> populate dot1qVlanCurrentTable data context.
* Populate data context here. (optionally, delay until row prep)
*/
/*
* TRANSIENT or semi-TRANSIENT data:
* copy data or save any info needed to do it in row_prep.
*/
/*
* setup/save data for dot1qVlanFdbId
* dot1qVlanFdbId(3)/UNSIGNED32/ASN_UNSIGNED/u_long(u_long)//l/A/w/e/r/d/h
*/
/*
* TODO:246:r: |-> Define dot1qVlanFdbId mapping.
* Map values between raw/native values and MIB values
*
* Integer based value can usually just do a direct copy.
*/
rowreq_ctx->data.dot1qVlanFdbId = dot1qVlanFdbId;
/*
* setup/save data for dot1qVlanCurrentEgressPorts
* dot1qVlanCurrentEgressPorts(4)/PortList/ASN_OCTET_STR/char(char)//L/A/w/e/r/d/h
*/
/*
* TODO:246:r: |-> Define dot1qVlanCurrentEgressPorts mapping.
* Map values between raw/native values and MIB values
*
* if(MFD_SUCCESS !=
* dot1qVlanCurrentEgressPorts_map(&rowreq_ctx->data.dot1qVlanCurrentEgressPorts, &rowreq_ctx->data.dot1qVlanCurrentEgressPorts_len,
* dot1qVlanCurrentEgressPorts, dot1qVlanCurrentEgressPorts_len, 0)) {
* return MFD_ERROR;
* }
*/
/*
* make sure there is enough space for dot1qVlanCurrentEgressPorts data
*/
if ((NULL == rowreq_ctx->data.dot1qVlanCurrentEgressPorts) ||
(rowreq_ctx->data.dot1qVlanCurrentEgressPorts_len <
(dot1qVlanCurrentEgressPorts_len* sizeof(dot1qVlanCurrentEgressPorts[0])))) {
snmp_log(LOG_ERR,"not enough space for value (dot1qVlanCurrentEgressPorts)\n");
return MFD_ERROR;
}
rowreq_ctx->data.dot1qVlanCurrentEgressPorts_len = dot1qVlanCurrentEgressPorts_len* sizeof(dot1qVlanCurrentEgressPorts[0]);
memcpy( rowreq_ctx->data.dot1qVlanCurrentEgressPorts, dot1qVlanCurrentEgressPorts, dot1qVlanCurrentEgressPorts_len* sizeof(dot1qVlanCurrentEgressPorts[0]) );
/*
* setup/save data for dot1qVlanCurrentUntaggedPorts
* dot1qVlanCurrentUntaggedPorts(5)/PortList/ASN_OCTET_STR/char(char)//L/A/w/e/r/d/h
*/
/*
* TODO:246:r: |-> Define dot1qVlanCurrentUntaggedPorts mapping.
* Map values between raw/native values and MIB values
*
* if(MFD_SUCCESS !=
* dot1qVlanCurrentUntaggedPorts_map(&rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts, &rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts_len,
* dot1qVlanCurrentUntaggedPorts, dot1qVlanCurrentUntaggedPorts_len, 0)) {
* return MFD_ERROR;
* }
*/
/*
* make sure there is enough space for dot1qVlanCurrentUntaggedPorts data
*/
if ((NULL == rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts) ||
(rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts_len <
(dot1qVlanCurrentUntaggedPorts_len* sizeof(dot1qVlanCurrentUntaggedPorts[0])))) {
snmp_log(LOG_ERR,"not enough space for value (dot1qVlanCurrentUntaggedPorts)\n");
return MFD_ERROR;
}
rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts_len = dot1qVlanCurrentUntaggedPorts_len* sizeof(dot1qVlanCurrentUntaggedPorts[0]);
memcpy( rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts, dot1qVlanCurrentUntaggedPorts, dot1qVlanCurrentUntaggedPorts_len* sizeof(dot1qVlanCurrentUntaggedPorts[0]) );
/*
* setup/save data for dot1qVlanStatus
* dot1qVlanStatus(6)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h
*/
/*
* TODO:246:r: |-> Define dot1qVlanStatus mapping.
* Map values between raw/native values and MIB values
*
* enums usually need mapping.
*/
if(MFD_SUCCESS !=
dot1qVlanStatus_map(&rowreq_ctx->data.dot1qVlanStatus, dot1qVlanStatus )) {
return MFD_ERROR;
}
/*
* setup/save data for dot1qVlanCreationTime
* dot1qVlanCreationTime(7)/TICKS/ASN_TIMETICKS/u_long(u_long)//l/A/w/e/r/d/h
*/
/*
* TODO:246:r: |-> Define dot1qVlanCreationTime mapping.
* Map values between raw/native values and MIB values
*
* Integer based value can usually just do a direct copy.
*/
rowreq_ctx->data.dot1qVlanCreationTime = dot1qVlanCreationTime;
/*
* setup/save data for dot1qVlanFdbId
* dot1qVlanFdbId(3)/UNSIGNED32/ASN_UNSIGNED/u_long(u_long)//l/A/w/e/r/d/h
*/
rowreq_ctx->data.dot1qVlanFdbId = vlan_tab_local[vlan_i].fid;
/*
* setup/save data for dot1qVlanCurrentEgressPorts
* dot1qVlanCurrentEgressPorts(4)/PortList/ASN_OCTET_STR/char(char)//L/A/w/e/r/d/h
*/
if (NULL == rowreq_ctx->data.dot1qVlanCurrentEgressPorts) {
snmp_log(LOG_ERR,"not enough space for value (dot1qVlanCurrentEgressPorts)\n");
dot1qVlanCurrentTable_release_rowreq_ctx(rowreq_ctx);
return MFD_ERROR;
}
convert_portmask_to_snmp_bitmask(hal_nports_local,
vlan_tab_local[vlan_i].port_mask & RTU_PMASK_MAX(rtu_nports_local),
rowreq_ctx->data.dot1qVlanCurrentEgressPorts,
&rowreq_ctx->data.dot1qVlanCurrentEgressPorts_len);
/*
* setup/save data for dot1qVlanCurrentUntaggedPorts
* dot1qVlanCurrentUntaggedPorts(5)/PortList/ASN_OCTET_STR/char(char)//L/A/w/e/r/d/h
*/
if (NULL == rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts) {
snmp_log(LOG_ERR,"not enough space for value (dot1qVlanCurrentUntaggedPorts)\n");
dot1qVlanCurrentTable_release_rowreq_ctx(rowreq_ctx);
return MFD_ERROR;
}
convert_portmask_to_snmp_bitmask(hal_nports_local,
vlan_tab_local[vlan_i].port_mask & untag_mask,
rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts,
&rowreq_ctx->data.dot1qVlanCurrentUntaggedPorts_len);
/*
* setup/save data for dot1qVlanStatus
* dot1qVlanStatus(6)/INTEGER/ASN_INTEGER/long(u_long)//l/A/w/E/r/d/h
*/
/*
* Hardcode to Permanent(2)
*/
rowreq_ctx->data.dot1qVlanStatus = DOT1QVLANSTATUS_PERMANENT;
/*
* setup/save data for dot1qVlanCreationTime
* dot1qVlanCreationTime(7)/TICKS/ASN_TIMETICKS/u_long(u_long)//l/A/w/e/r/d/h
*/
rowreq_ctx->data.dot1qVlanCreationTime = dot1qVlanTimeMark;
/*
* insert into table container
*/
......@@ -408,17 +355,6 @@ dot1qVlanCurrentTable_container_load(netsnmp_container *container)
++count;
}
/*
***************************************************
*** START EXAMPLE CODE ***
***---------------------------------------------***/
if(NULL != filep)
fclose(filep);
/*
***---------------------------------------------***
*** END EXAMPLE CODE ***
***************************************************/
DEBUGMSGT(("verbose:dot1qVlanCurrentTable:dot1qVlanCurrentTable_container_load",
"inserted %d records\n", count));
......
userspace/snmpd/bridge_mib/dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_get.c
View file @ a879488d
......@@ -336,88 +336,6 @@ dot1qVlanCurrentUntaggedPorts_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx,
return MFD_SUCCESS;
} /* dot1qVlanCurrentUntaggedPorts_get */
/*---------------------------------------------------------------------
* Q-BRIDGE-MIB::dot1qVlanCurrentEntry.dot1qVlanStatus
* dot1qVlanStatus is subid 6 of dot1qVlanCurrentEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.2.1.17.7.1.4.2.1.6
* Description:
This object indicates the status of this entry.
other(1) - this entry is currently in use, but the
conditions under which it will remain so differ
from the following values.
permanent(2) - this entry, corresponding to an entry
in dot1qVlanStaticTable, is currently in use and
will remain so after the next reset of the
device. The port lists for this entry include
ports from the equivalent dot1qVlanStaticTable
entry and ports learned dynamically.
dynamicGvrp(3) - this entry is currently in use
and will remain so until removed by GVRP. There
is no static entry for this VLAN, and it will be
removed when the last port leaves the VLAN.
*
* Attributes:
* accessible 1 isscalar 0 enums 1 hasdefval 0
* readable 1 iscolumn 1 ranges 0 hashint 0
* settable 0
*
* Enum range: 3/8. Values: other(1), permanent(2), dynamicGvrp(3)
*
* Its syntax is INTEGER (based on perltype INTEGER)
* The net-snmp type is ASN_INTEGER. The C type decl is long (u_long)
*/
/**
* map a value from its original native format to the MIB format.
*
* @retval MFD_SUCCESS : success
* @retval MFD_ERROR : Any other error
*
* @note parameters follow the memset convention (dest, src).
*
* @note generation and use of this function can be turned off by re-running
* mib2c after adding the following line to the file
* defaults/node-dot1qVlanStatus.m2d :
* @eval $m2c_node_skip_mapping = 1@
*
* @remark
* If the values for your data type don't exactly match the
* possible values defined by the mib, you should map them here.
* Otherwise, just do a direct copy.
*/
int
dot1qVlanStatus_map(u_long *mib_dot1qVlanStatus_val_ptr, u_long raw_dot1qVlanStatus_val)
{
netsnmp_assert(NULL != mib_dot1qVlanStatus_val_ptr);
DEBUGMSGTL(("verbose:dot1qVlanCurrentTable:dot1qVlanStatus_map","called\n"));
/*
* TODO:241:o: |-> Implement dot1qVlanStatus enum mapping.
* uses INTERNAL_* macros defined in the header files
*/
switch(raw_dot1qVlanStatus_val) {
case INTERNAL_DOT1QVLANCURRENTTABLE_DOT1QVLANSTATUS_OTHER:
*mib_dot1qVlanStatus_val_ptr = DOT1QVLANSTATUS_OTHER;
break;
case INTERNAL_DOT1QVLANCURRENTTABLE_DOT1QVLANSTATUS_PERMANENT:
*mib_dot1qVlanStatus_val_ptr = DOT1QVLANSTATUS_PERMANENT;
break;
case INTERNAL_DOT1QVLANCURRENTTABLE_DOT1QVLANSTATUS_DYNAMICGVRP:
*mib_dot1qVlanStatus_val_ptr = DOT1QVLANSTATUS_DYNAMICGVRP;
break;
default:
snmp_log(LOG_ERR, "couldn't map value %ld for dot1qVlanStatus\n", raw_dot1qVlanStatus_val );
return MFD_ERROR;
}
return MFD_SUCCESS;
} /* dot1qVlanStatus_map */
/**
* Extract the current value of the dot1qVlanStatus data.
*
......
userspace/snmpd/bridge_mib/dot1qVlanCurrentTable/dot1qVlanCurrentTable_data_get.h
View file @ a879488d
......@@ -41,18 +41,10 @@ extern "C" {
/*
* indexes
*/
int dot1qVlanTimeMark_map(u_long *mib_dot1qVlanTimeMark_val_ptr, u_long raw_dot1qVlanTimeMark_val);
int dot1qVlanIndex_map(u_long *mib_dot1qVlanIndex_val_ptr, u_long raw_dot1qVlanIndex_val);
int dot1qVlanFdbId_map(u_long *mib_dot1qVlanFdbId_val_ptr, u_long raw_dot1qVlanFdbId_val);
int dot1qVlanFdbId_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx, u_long * dot1qVlanFdbId_val_ptr );
int dot1qVlanCurrentEgressPorts_map(char **mib_dot1qVlanCurrentEgressPorts_val_ptr_ptr, size_t *mib_dot1qVlanCurrentEgressPorts_val_ptr_len_ptr, char *raw_dot1qVlanCurrentEgressPorts_val_ptr, size_t raw_dot1qVlanCurrentEgressPorts_val_ptr_len, int allow_realloc);
int dot1qVlanCurrentEgressPorts_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx, char **dot1qVlanCurrentEgressPorts_val_ptr_ptr, size_t *dot1qVlanCurrentEgressPorts_val_ptr_len_ptr );
int dot1qVlanCurrentUntaggedPorts_map(char **mib_dot1qVlanCurrentUntaggedPorts_val_ptr_ptr, size_t *mib_dot1qVlanCurrentUntaggedPorts_val_ptr_len_ptr, char *raw_dot1qVlanCurrentUntaggedPorts_val_ptr, size_t raw_dot1qVlanCurrentUntaggedPorts_val_ptr_len, int allow_realloc);
int dot1qVlanCurrentUntaggedPorts_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx, char **dot1qVlanCurrentUntaggedPorts_val_ptr_ptr, size_t *dot1qVlanCurrentUntaggedPorts_val_ptr_len_ptr );
int dot1qVlanStatus_map(u_long *mib_dot1qVlanStatus_val_ptr, u_long raw_dot1qVlanStatus_val);
int dot1qVlanStatus_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx, u_long * dot1qVlanStatus_val_ptr );
int dot1qVlanCreationTime_map(u_long *mib_dot1qVlanCreationTime_val_ptr, u_long raw_dot1qVlanCreationTime_val);
int dot1qVlanCreationTime_get( dot1qVlanCurrentTable_rowreq_ctx *rowreq_ctx, u_long * dot1qVlanCreationTime_val_ptr );
......
userspace/snmpd/bridge_mib/init_bridge_mib.c
View file @ a879488d
......@@ -16,6 +16,7 @@
#include "dot1qFdbTable/dot1qFdbTable.h"
#include "dot1qPortVlanTable/dot1qPortVlanTable.h"
#include "dot1qTpFdbTable/dot1qTpFdbTable.h"
#include "dot1qVlanCurrentTable/dot1qVlanCurrentTable.h"
#include "dot1qVlanStaticTable/dot1qVlanStaticTable.h"
void init_bridge_mib(void)
......@@ -28,5 +29,6 @@ void init_bridge_mib(void)
init_dot1qFdbTable();
init_dot1qPortVlanTable();
init_dot1qTpFdbTable();
init_dot1qVlanCurrentTable();
init_dot1qVlanStaticTable();
}
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