Skip to content

Commit

Permalink
[nes]: GMPLS changes ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@nes-repo
nes-repo committed Nov 21, 2015
1 parent a4073c7 commit 8755c8b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 104 deletions.
92 changes: 0 additions & 92 deletions mpls/mplsTeStdMIB.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1923,14 +1923,10 @@ mplsTunnelHopTable_mapper (
case MPLSTUNNELHOPIPPREFIXLEN:
snmp_set_var_typed_integer (request->requestvb, ASN_UNSIGNED, table_entry->u32IpPrefixLen);
break;
case MPLSTUNNELHOPASNUMBER:
snmp_set_var_typed_value (request->requestvb, ASN_OCTET_STR, (u_char*) table_entry->au8AsNumber, table_entry->u16AsNumber_len);
break;
case MPLSTUNNELHOPADDRUNNUM:
snmp_set_var_typed_value (request->requestvb, ASN_OCTET_STR, (u_char*) table_entry->au8AddrUnnum, table_entry->u16AddrUnnum_len);
break;
case MPLSTUNNELHOPLSPID:
snmp_set_var_typed_value (request->requestvb, ASN_OCTET_STR, (u_char*) table_entry->au8LspId, table_entry->u16LspId_len);
break;
case MPLSTUNNELHOPTYPE:
snmp_set_var_typed_integer (request->requestvb, ASN_INTEGER, table_entry->i32Type);
Expand All @@ -1941,9 +1937,6 @@ mplsTunnelHopTable_mapper (
case MPLSTUNNELHOPPATHOPTIONNAME:
snmp_set_var_typed_value (request->requestvb, ASN_OCTET_STR, (u_char*) table_entry->au8PathOptionName, table_entry->u16PathOptionName_len);
break;
case MPLSTUNNELHOPENTRYPATHCOMP:
snmp_set_var_typed_integer (request->requestvb, ASN_INTEGER, table_entry->i32EntryPathComp);
break;
case MPLSTUNNELHOPROWSTATUS:
snmp_set_var_typed_integer (request->requestvb, ASN_INTEGER, table_entry->u8RowStatus);
break;
Expand Down Expand Up @@ -1993,14 +1986,6 @@ mplsTunnelHopTable_mapper (
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPASNUMBER:
ret = netsnmp_check_vb_type_and_max_size (request->requestvb, ASN_OCTET_STR, sizeof (table_entry->au8AsNumber));
if (ret != SNMP_ERR_NOERROR)
{
netsnmp_set_request_error (reqinfo, request, ret);
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPADDRUNNUM:
ret = netsnmp_check_vb_type_and_max_size (request->requestvb, ASN_OCTET_STR, sizeof (table_entry->au8AddrUnnum));
if (ret != SNMP_ERR_NOERROR)
Expand All @@ -2009,14 +1994,6 @@ mplsTunnelHopTable_mapper (
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPLSPID:
ret = netsnmp_check_vb_type_and_max_size (request->requestvb, ASN_OCTET_STR, sizeof (table_entry->au8LspId));
if (ret != SNMP_ERR_NOERROR)
{
netsnmp_set_request_error (reqinfo, request, ret);
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPTYPE:
ret = netsnmp_check_vb_type (requests->requestvb, ASN_INTEGER);
if (ret != SNMP_ERR_NOERROR)
Expand All @@ -2041,14 +2018,6 @@ mplsTunnelHopTable_mapper (
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPENTRYPATHCOMP:
ret = netsnmp_check_vb_type (requests->requestvb, ASN_INTEGER);
if (ret != SNMP_ERR_NOERROR)
{
netsnmp_set_request_error (reqinfo, request, ret);
return SNMP_ERR_NOERROR;
}
break;
case MPLSTUNNELHOPROWSTATUS:
ret = netsnmp_check_vb_rowstatus (request->requestvb, (table_entry ? RS_ACTIVE : RS_NONEXISTENT));
if (ret != SNMP_ERR_NOERROR)
Expand Down Expand Up @@ -2210,24 +2179,6 @@ mplsTunnelHopTable_mapper (

table_entry->u32IpPrefixLen = *request->requestvb->val.integer;
break;
case MPLSTUNNELHOPASNUMBER:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (xOctetString_t) + sizeof (table_entry->au8AsNumber))) == NULL)
{
netsnmp_set_request_error (reqinfo, request, SNMP_ERR_RESOURCEUNAVAILABLE);
return SNMP_ERR_NOERROR;
}
else if (pvOldDdata != table_entry)
{
((xOctetString_t*) pvOldDdata)->pData = pvOldDdata + sizeof (xOctetString_t);
((xOctetString_t*) pvOldDdata)->u16Len = table_entry->u16AsNumber_len;
memcpy (((xOctetString_t*) pvOldDdata)->pData, table_entry->au8AsNumber, sizeof (table_entry->au8AsNumber));
netsnmp_request_add_list_data (request, netsnmp_create_data_list (ROLLBACK_BUFFER, pvOldDdata, &xBuffer_free));
}

memset (table_entry->au8AsNumber, 0, sizeof (table_entry->au8AsNumber));
memcpy (table_entry->au8AsNumber, request->requestvb->val.string, request->requestvb->val_len);
table_entry->u16AsNumber_len = request->requestvb->val_len;
break;
case MPLSTUNNELHOPADDRUNNUM:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (xOctetString_t) + sizeof (table_entry->au8AddrUnnum))) == NULL)
{
Expand All @@ -2246,24 +2197,6 @@ mplsTunnelHopTable_mapper (
memcpy (table_entry->au8AddrUnnum, request->requestvb->val.string, request->requestvb->val_len);
table_entry->u16AddrUnnum_len = request->requestvb->val_len;
break;
case MPLSTUNNELHOPLSPID:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (xOctetString_t) + sizeof (table_entry->au8LspId))) == NULL)
{
netsnmp_set_request_error (reqinfo, request, SNMP_ERR_RESOURCEUNAVAILABLE);
return SNMP_ERR_NOERROR;
}
else if (pvOldDdata != table_entry)
{
((xOctetString_t*) pvOldDdata)->pData = pvOldDdata + sizeof (xOctetString_t);
((xOctetString_t*) pvOldDdata)->u16Len = table_entry->u16LspId_len;
memcpy (((xOctetString_t*) pvOldDdata)->pData, table_entry->au8LspId, sizeof (table_entry->au8LspId));
netsnmp_request_add_list_data (request, netsnmp_create_data_list (ROLLBACK_BUFFER, pvOldDdata, &xBuffer_free));
}

memset (table_entry->au8LspId, 0, sizeof (table_entry->au8LspId));
memcpy (table_entry->au8LspId, request->requestvb->val.string, request->requestvb->val_len);
table_entry->u16LspId_len = request->requestvb->val_len;
break;
case MPLSTUNNELHOPTYPE:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (table_entry->i32Type))) == NULL)
{
Expand Down Expand Up @@ -2310,20 +2243,6 @@ mplsTunnelHopTable_mapper (
memcpy (table_entry->au8PathOptionName, request->requestvb->val.string, request->requestvb->val_len);
table_entry->u16PathOptionName_len = request->requestvb->val_len;
break;
case MPLSTUNNELHOPENTRYPATHCOMP:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (table_entry->i32EntryPathComp))) == NULL)
{
netsnmp_set_request_error (reqinfo, request, SNMP_ERR_RESOURCEUNAVAILABLE);
return SNMP_ERR_NOERROR;
}
else if (pvOldDdata != table_entry)
{
memcpy (pvOldDdata, &table_entry->i32EntryPathComp, sizeof (table_entry->i32EntryPathComp));
netsnmp_request_add_list_data (request, netsnmp_create_data_list (ROLLBACK_BUFFER, pvOldDdata, &xBuffer_free));
}

table_entry->i32EntryPathComp = *request->requestvb->val.integer;
break;
case MPLSTUNNELHOPSTORAGETYPE:
if (pvOldDdata == NULL && (pvOldDdata = xBuffer_cAlloc (sizeof (table_entry->u8StorageType))) == NULL)
{
Expand Down Expand Up @@ -2387,18 +2306,10 @@ mplsTunnelHopTable_mapper (
case MPLSTUNNELHOPIPPREFIXLEN:
memcpy (&table_entry->u32IpPrefixLen, pvOldDdata, sizeof (table_entry->u32IpPrefixLen));
break;
case MPLSTUNNELHOPASNUMBER:
memcpy (table_entry->au8AsNumber, ((xOctetString_t*) pvOldDdata)->pData, ((xOctetString_t*) pvOldDdata)->u16Len);
table_entry->u16AsNumber_len = ((xOctetString_t*) pvOldDdata)->u16Len;
break;
case MPLSTUNNELHOPADDRUNNUM:
memcpy (table_entry->au8AddrUnnum, ((xOctetString_t*) pvOldDdata)->pData, ((xOctetString_t*) pvOldDdata)->u16Len);
table_entry->u16AddrUnnum_len = ((xOctetString_t*) pvOldDdata)->u16Len;
break;
case MPLSTUNNELHOPLSPID:
memcpy (table_entry->au8LspId, ((xOctetString_t*) pvOldDdata)->pData, ((xOctetString_t*) pvOldDdata)->u16Len);
table_entry->u16LspId_len = ((xOctetString_t*) pvOldDdata)->u16Len;
break;
case MPLSTUNNELHOPTYPE:
memcpy (&table_entry->i32Type, pvOldDdata, sizeof (table_entry->i32Type));
break;
Expand All @@ -2409,9 +2320,6 @@ mplsTunnelHopTable_mapper (
memcpy (table_entry->au8PathOptionName, ((xOctetString_t*) pvOldDdata)->pData, ((xOctetString_t*) pvOldDdata)->u16Len);
table_entry->u16PathOptionName_len = ((xOctetString_t*) pvOldDdata)->u16Len;
break;
case MPLSTUNNELHOPENTRYPATHCOMP:
memcpy (&table_entry->i32EntryPathComp, pvOldDdata, sizeof (table_entry->i32EntryPathComp));
break;
case MPLSTUNNELHOPROWSTATUS:
switch (*request->requestvb->val.integer)
{
Expand Down
12 changes: 0 additions & 12 deletions mpls/mplsTeStdMIB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1056,13 +1056,10 @@ Netsnmp_Node_Handler mplsTunnelTable_mapper;
#define MPLSTUNNELHOPADDRTYPE 4
#define MPLSTUNNELHOPIPADDR 5
#define MPLSTUNNELHOPIPPREFIXLEN 6
#define MPLSTUNNELHOPASNUMBER 7
#define MPLSTUNNELHOPADDRUNNUM 8
#define MPLSTUNNELHOPLSPID 9
#define MPLSTUNNELHOPTYPE 10
#define MPLSTUNNELHOPINCLUDE 11
#define MPLSTUNNELHOPPATHOPTIONNAME 12
#define MPLSTUNNELHOPENTRYPATHCOMP 13
#define MPLSTUNNELHOPROWSTATUS 14
#define MPLSTUNNELHOPSTORAGETYPE 15

Expand All @@ -1084,10 +1081,6 @@ enum
mplsTunnelHopInclude_true_c = 1,
mplsTunnelHopInclude_false_c = 2,

/* enums for column mplsTunnelHopEntryPathComp */
mplsTunnelHopEntryPathComp_dynamic_c = 1,
mplsTunnelHopEntryPathComp_explicit_c = 2,

/* enums for column mplsTunnelHopRowStatus */
mplsTunnelHopRowStatus_active_c = 1,
mplsTunnelHopRowStatus_notInService_c = 2,
Expand Down Expand Up @@ -1117,17 +1110,12 @@ typedef struct mplsTunnelHopEntry_t
uint8_t au8IpAddr[32];
size_t u16IpAddr_len; /* # of uint8_t elements */
uint32_t u32IpPrefixLen;
uint8_t au8AsNumber[4];
size_t u16AsNumber_len; /* # of uint8_t elements */
uint8_t au8AddrUnnum[4];
size_t u16AddrUnnum_len; /* # of uint8_t elements */
uint8_t au8LspId[6];
size_t u16LspId_len; /* # of uint8_t elements */
int32_t i32Type;
uint8_t u8Include;
uint8_t au8PathOptionName[255];
size_t u16PathOptionName_len; /* # of uint8_t elements */
int32_t i32EntryPathComp;
uint8_t u8RowStatus;
uint8_t u8StorageType;

Expand Down

0 comments on commit 8755c8b

Please sign in to comment.