Skip to content

Commit

Permalink
[nes]: ETHERNET changes ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@nes-repo
nes-repo committed May 25, 2015
1 parent 7bc2ed2 commit 4db22fb
Show file tree
Hide file tree
Showing 8 changed files with 12,632 additions and 15 deletions.
39 changes: 28 additions & 11 deletions ethernet/ieee8021BridgeMib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6128,7 +6128,7 @@ ieee8021BridgePortMmrpTable_getNext (
snmp_set_var_typed_integer (idx, ASN_UNSIGNED, poEntry->u32ComponentId);
idx = idx->next_variable;
snmp_set_var_typed_integer (idx, ASN_UNSIGNED, poEntry->u32Port);
*my_data_context = (void*) &poEntry->oMmrp;
*my_data_context = (void*) poEntry;
*my_loop_context = (void*) xBTree_nodeGetNext (&poEntry->oBTreeNode, &oIeee8021BridgeBasePortTable_BTree);
return put_index_data;
}
Expand All @@ -6150,7 +6150,7 @@ ieee8021BridgePortMmrpTable_get (
return false;
}

*my_data_context = (void*) &poEntry->oMmrp;
*my_data_context = (void*) poEntry;
return true;
}

Expand All @@ -6165,6 +6165,7 @@ ieee8021BridgePortMmrpTable_mapper (
netsnmp_request_info *request;
netsnmp_table_request_info *table_info;
ieee8021BridgePortMmrpEntry_t *table_entry;
register ieee8021BridgeBasePortEntry_t *poEntry = NULL;
void *pvOldDdata = NULL;
int ret;

Expand All @@ -6176,13 +6177,14 @@ ieee8021BridgePortMmrpTable_mapper (
case MODE_GET:
for (request = requests; request != NULL; request = request->next)
{
table_entry = (ieee8021BridgePortMmrpEntry_t*) netsnmp_extract_iterator_context (request);
poEntry = (ieee8021BridgeBasePortEntry_t*) netsnmp_extract_iterator_context (request);
table_info = netsnmp_extract_table_info (request);
if (table_entry == NULL)
if (poEntry == NULL)
{
netsnmp_set_request_error (reqinfo, request, SNMP_NOSUCHINSTANCE);
continue;
}
table_entry = &poEntry->oMmrp;

switch (table_info->colnum)
{
Expand Down Expand Up @@ -6212,8 +6214,9 @@ ieee8021BridgePortMmrpTable_mapper (
case MODE_SET_RESERVE1:
for (request = requests; request != NULL; request = request->next)
{
table_entry = (ieee8021BridgePortMmrpEntry_t*) netsnmp_extract_iterator_context (request);
poEntry = (ieee8021BridgeBasePortEntry_t*) netsnmp_extract_iterator_context (request);
table_info = netsnmp_extract_table_info (request);
table_entry = &poEntry->oMmrp;

switch (table_info->colnum)
{
Expand Down Expand Up @@ -6244,14 +6247,26 @@ ieee8021BridgePortMmrpTable_mapper (
case MODE_SET_RESERVE2:
for (request = requests; request != NULL; request = request->next)
{
table_entry = (ieee8021BridgePortMmrpEntry_t*) netsnmp_extract_iterator_context (request);
poEntry = (ieee8021BridgeBasePortEntry_t*) netsnmp_extract_iterator_context (request);
table_info = netsnmp_extract_table_info (request);

if (table_entry == NULL)
if (poEntry == NULL)
{
netsnmp_set_request_error (reqinfo, request, SNMP_NOSUCHINSTANCE);
continue;
}
table_entry = &poEntry->oMmrp;

switch (table_info->colnum)
{
case IEEE8021BRIDGEPORTMMRPENABLEDSTATUS:
case IEEE8021BRIDGEPORTRESTRICTEDGROUPREGISTRATION:
if (poEntry->u8RowStatus == xRowStatus_active_c || poEntry->u8RowStatus == xRowStatus_notReady_c)
{
netsnmp_set_request_error (reqinfo, request, SNMP_ERR_RESOURCEUNAVAILABLE);
return SNMP_ERR_NOERROR;
}
break;
}
}
break;

Expand All @@ -6262,8 +6277,9 @@ ieee8021BridgePortMmrpTable_mapper (
for (request = requests; request != NULL; request = request->next)
{
pvOldDdata = netsnmp_request_get_list_data (request, ROLLBACK_BUFFER);
table_entry = (ieee8021BridgePortMmrpEntry_t*) netsnmp_extract_iterator_context (request);
poEntry = (ieee8021BridgeBasePortEntry_t*) netsnmp_extract_iterator_context (request);
table_info = netsnmp_extract_table_info (request);
table_entry = &poEntry->oMmrp;

switch (table_info->colnum)
{
Expand Down Expand Up @@ -6303,12 +6319,13 @@ ieee8021BridgePortMmrpTable_mapper (
for (request = requests; request != NULL; request = request->next)
{
pvOldDdata = netsnmp_request_get_list_data (request, ROLLBACK_BUFFER);
table_entry = (ieee8021BridgePortMmrpEntry_t*) netsnmp_extract_iterator_context (request);
poEntry = (ieee8021BridgeBasePortEntry_t*) netsnmp_extract_iterator_context (request);
table_info = netsnmp_extract_table_info (request);
if (table_entry == NULL || pvOldDdata == NULL)
if (poEntry == NULL || pvOldDdata == NULL)
{
continue;
}
table_entry = &poEntry->oMmrp;

switch (table_info->colnum)
{
Expand Down
8 changes: 4 additions & 4 deletions ethernet/ieee8021BridgeMib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,8 +1027,8 @@ enum
typedef struct ieee8021BridgePortMmrpEntry_t
{
/* Index values */
uint32_t u32BasePortComponentId;
uint32_t u32BasePort;
// uint32_t u32BasePortComponentId;
// uint32_t u32BasePort;

/* Column values */
uint8_t u8EnabledStatus;
Expand All @@ -1037,10 +1037,10 @@ typedef struct ieee8021BridgePortMmrpEntry_t
size_t u16LastPduOrigin_len; /* # of uint8_t elements */
uint8_t u8RestrictedGroupRegistration;

xBTree_Node_t oBTreeNode;
// xBTree_Node_t oBTreeNode;
} ieee8021BridgePortMmrpEntry_t;

extern xBTree_t oIeee8021BridgePortMmrpTable_BTree;
// extern xBTree_t oIeee8021BridgePortMmrpTable_BTree;

/* ieee8021BridgePortMmrpTable table mapper */
void ieee8021BridgePortMmrpTable_init (void);
Expand Down

0 comments on commit 4db22fb

Please sign in to comment.