Skip to content
Snippets Groups Projects
Commit 0633d243 authored by Michal Wasiak's avatar Michal Wasiak Committed by Adam Wujek
Browse files

snmp/bridge_mib: update dot1dBasePortTable, remove two OIDs 


Remove the following OIDs, since such counters are not implemented in WRS.
--dot1dBasePortDelayExceededDiscards
--dot1dBasePortMtuExceededDiscards

Signed-off-by: default avatarMichal Wasiak <michal.wasiak@gmail.com>
parent 5fc3d88f
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
userspace/snmpd/bridge_mib/dot1dBasePortTable/dot1dBasePortTable.h
+ 0
− 11
View file @ 0633d243
......@@ -87,17 +87,6 @@ typedef struct dot1dBasePortTable_data_s {
*/
oid dot1dBasePortCircuit[128];
size_t dot1dBasePortCircuit_len; /* # of oid elements, not bytes */
/*
* dot1dBasePortDelayExceededDiscards(4)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
*/
u_long dot1dBasePortDelayExceededDiscards;
/*
* dot1dBasePortMtuExceededDiscards(5)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h
*/
u_long dot1dBasePortMtuExceededDiscards;
} dot1dBasePortTable_data;
......
userspace/snmpd/bridge_mib/dot1dBasePortTable/dot1dBasePortTable_data_get.c
+ 0
− 109
View file @ 0633d243
......@@ -254,113 +254,4 @@ dot1dBasePortCircuit_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, oid **dot1d
return MFD_SUCCESS;
} /* dot1dBasePortCircuit_get */
/*---------------------------------------------------------------------
* BRIDGE-MIB::dot1dBasePortEntry.dot1dBasePortDelayExceededDiscards
* dot1dBasePortDelayExceededDiscards is subid 4 of dot1dBasePortEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.2.1.17.1.4.1.4
* Description:
The number of frames discarded by this port due
to excessive transit delay through the bridge. It
is incremented by both transparent and source
route bridges.
*
* Attributes:
* accessible 1 isscalar 0 enums 0 hasdefval 0
* readable 1 iscolumn 1 ranges 0 hashint 0
* settable 0
*
*
* Its syntax is COUNTER (based on perltype COUNTER)
* The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
*/
/**
* Extract the current value of the dot1dBasePortDelayExceededDiscards data.
*
* Set a value using the data context for the row.
*
* @param rowreq_ctx
* Pointer to the row request context.
* @param dot1dBasePortDelayExceededDiscards_val_ptr
* Pointer to storage for a u_long variable
*
* @retval MFD_SUCCESS : success
* @retval MFD_SKIP : skip this node (no value for now)
* @retval MFD_ERROR : Any other error
*/
int
dot1dBasePortDelayExceededDiscards_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, u_long * dot1dBasePortDelayExceededDiscards_val_ptr )
{
/** we should have a non-NULL pointer */
netsnmp_assert( NULL != dot1dBasePortDelayExceededDiscards_val_ptr );
DEBUGMSGTL(("verbose:dot1dBasePortTable:dot1dBasePortDelayExceededDiscards_get","called\n"));
netsnmp_assert(NULL != rowreq_ctx);
/*
* TODO:231:o: |-> Extract the current value of the dot1dBasePortDelayExceededDiscards data.
* copy (* dot1dBasePortDelayExceededDiscards_val_ptr ) from rowreq_ctx->data
*/
(* dot1dBasePortDelayExceededDiscards_val_ptr ) = rowreq_ctx->data.dot1dBasePortDelayExceededDiscards;
return MFD_SUCCESS;
} /* dot1dBasePortDelayExceededDiscards_get */
/*---------------------------------------------------------------------
* BRIDGE-MIB::dot1dBasePortEntry.dot1dBasePortMtuExceededDiscards
* dot1dBasePortMtuExceededDiscards is subid 5 of dot1dBasePortEntry.
* Its status is Current, and its access level is ReadOnly.
* OID: .1.3.6.1.2.1.17.1.4.1.5
* Description:
The number of frames discarded by this port due
to an excessive size. It is incremented by both
transparent and source route bridges.
*
* Attributes:
* accessible 1 isscalar 0 enums 0 hasdefval 0
* readable 1 iscolumn 1 ranges 0 hashint 0
* settable 0
*
*
* Its syntax is COUNTER (based on perltype COUNTER)
* The net-snmp type is ASN_COUNTER. The C type decl is u_long (u_long)
*/
/**
* Extract the current value of the dot1dBasePortMtuExceededDiscards data.
*
* Set a value using the data context for the row.
*
* @param rowreq_ctx
* Pointer to the row request context.
* @param dot1dBasePortMtuExceededDiscards_val_ptr
* Pointer to storage for a u_long variable
*
* @retval MFD_SUCCESS : success
* @retval MFD_SKIP : skip this node (no value for now)
* @retval MFD_ERROR : Any other error
*/
int
dot1dBasePortMtuExceededDiscards_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, u_long * dot1dBasePortMtuExceededDiscards_val_ptr )
{
/** we should have a non-NULL pointer */
netsnmp_assert( NULL != dot1dBasePortMtuExceededDiscards_val_ptr );
DEBUGMSGTL(("verbose:dot1dBasePortTable:dot1dBasePortMtuExceededDiscards_get","called\n"));
netsnmp_assert(NULL != rowreq_ctx);
/*
* TODO:231:o: |-> Extract the current value of the dot1dBasePortMtuExceededDiscards data.
* copy (* dot1dBasePortMtuExceededDiscards_val_ptr ) from rowreq_ctx->data
*/
(* dot1dBasePortMtuExceededDiscards_val_ptr ) = rowreq_ctx->data.dot1dBasePortMtuExceededDiscards;
return MFD_SUCCESS;
} /* dot1dBasePortMtuExceededDiscards_get */
/** @} */
userspace/snmpd/bridge_mib/dot1dBasePortTable/dot1dBasePortTable_data_get.h
+ 0
− 2
View file @ 0633d243
......@@ -44,8 +44,6 @@ extern "C" {
int dot1dBasePortIfIndex_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, long * dot1dBasePortIfIndex_val_ptr );
int dot1dBasePortCircuit_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, oid **dot1dBasePortCircuit_val_ptr_ptr, size_t *dot1dBasePortCircuit_val_ptr_len_ptr );
int dot1dBasePortDelayExceededDiscards_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, u_long * dot1dBasePortDelayExceededDiscards_val_ptr );
int dot1dBasePortMtuExceededDiscards_get( dot1dBasePortTable_rowreq_ctx *rowreq_ctx, u_long * dot1dBasePortMtuExceededDiscards_val_ptr );
int dot1dBasePortTable_indexes_set_tbl_idx(dot1dBasePortTable_mib_index *tbl_idx, long dot1dBasePort_val);
......
userspace/snmpd/bridge_mib/dot1dBasePortTable/dot1dBasePortTable_interface.c
+ 0
− 14
View file @ 0633d243
......@@ -605,20 +605,6 @@ rc = dot1dBasePortIfIndex_get(rowreq_ctx, (long *)var->val.string );
rc = dot1dBasePortCircuit_get(rowreq_ctx, (oid **)&var->val.string, &var->val_len );
break;
/* dot1dBasePortDelayExceededDiscards(4)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h */
case COLUMN_DOT1DBASEPORTDELAYEXCEEDEDDISCARDS:
var->val_len = sizeof(u_long);
var->type = ASN_COUNTER;
rc = dot1dBasePortDelayExceededDiscards_get(rowreq_ctx, (u_long *)var->val.string );
break;
/* dot1dBasePortMtuExceededDiscards(5)/COUNTER/ASN_COUNTER/u_long(u_long)//l/A/w/e/r/d/h */
case COLUMN_DOT1DBASEPORTMTUEXCEEDEDDISCARDS:
var->val_len = sizeof(u_long);
var->type = ASN_COUNTER;
rc = dot1dBasePortMtuExceededDiscards_get(rowreq_ctx, (u_long *)var->val.string );
break;
default:
if (DOT1DBASEPORTTABLE_MIN_COL <= column && column <= DOT1DBASEPORTTABLE_MAX_COL) {
DEBUGMSGTL(("internal:dot1dBasePortTable:_mfd_dot1dBasePortTable_get_column",
......
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