mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-27 14:37:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

SNMP traps quick fix: Do not return err_t as u16_t in snmp_varbind_len. This need further cleanup.

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2016-07-05 08:48:59 +02:00
parent 14ca418ac0
commit 5a1b9bf808
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/apps/snmp/snmp_traps.c
View File

@ -263,7 +263,7 @@ snmp_varbind_len(struct snmp_varbind *varbind)
switch (varbind->type) { switch (varbind->type) {
case SNMP_ASN1_TYPE_INTEGER: case SNMP_ASN1_TYPE_INTEGER:
if (varbind->value_len != sizeof (s32_t)) { if (varbind->value_len != sizeof (s32_t)) {
return ERR_VAL; return 0;
} }
snmp_asn1_enc_s32t_cnt(*((s32_t*) varbind->value), &value_value_len); snmp_asn1_enc_s32t_cnt(*((s32_t*) varbind->value), &value_value_len);
break; break;
@ -271,7 +271,7 @@ snmp_varbind_len(struct snmp_varbind *varbind)
case SNMP_ASN1_TYPE_GAUGE: case SNMP_ASN1_TYPE_GAUGE:
case SNMP_ASN1_TYPE_TIMETICKS: case SNMP_ASN1_TYPE_TIMETICKS:
if (varbind->value_len != sizeof (u32_t)) { if (varbind->value_len != sizeof (u32_t)) {
return ERR_VAL; return 0;
} }
snmp_asn1_enc_u32t_cnt(*((u32_t*) varbind->value), &value_value_len); snmp_asn1_enc_u32t_cnt(*((u32_t*) varbind->value), &value_value_len);
break; break;
@ -282,25 +282,25 @@ snmp_varbind_len(struct snmp_varbind *varbind)
break; break;
case SNMP_ASN1_TYPE_NULL: case SNMP_ASN1_TYPE_NULL:
if (varbind->value_len != 0) { if (varbind->value_len != 0) {
return ERR_VAL; return 0;
} }
value_value_len = 0; value_value_len = 0;
break; break;
case SNMP_ASN1_TYPE_OBJECT_ID: case SNMP_ASN1_TYPE_OBJECT_ID:
if ((varbind->value_len & 0x03) != 0) { if ((varbind->value_len & 0x03) != 0) {
return ERR_VAL; return 0;
} }
snmp_asn1_enc_oid_cnt((u32_t*) varbind->value, varbind->value_len >> 2, &value_value_len); snmp_asn1_enc_oid_cnt((u32_t*) varbind->value, varbind->value_len >> 2, &value_value_len);
break; break;
case SNMP_ASN1_TYPE_COUNTER64: case SNMP_ASN1_TYPE_COUNTER64:
if (varbind->value_len != (2 * sizeof (u32_t))) { if (varbind->value_len != (2 * sizeof (u32_t))) {
return ERR_VAL; return 0;
} }
snmp_asn1_enc_u64t_cnt((u32_t*) varbind->value, &value_value_len); snmp_asn1_enc_u64t_cnt((u32_t*) varbind->value, &value_value_len);
break; break;
default: default:
/* unsupported type */ /* unsupported type */
return ERR_VAL; return 0;
} }
} }
snmp_asn1_enc_length_cnt(value_value_len, &value_len_len); snmp_asn1_enc_length_cnt(value_value_len, &value_len_len);