mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile when SNMPv3 is disabled

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-03-01 20:23:55 +01:00
parent 78cdbff1b3
commit 4ef21e2597
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/apps/snmp/snmp_msg.c
View File

@ -356,7 +356,9 @@ snmp_receive(void *handle, struct pbuf *p, const ip_addr_t *source_ip, u16_t por
}
request.request_out_type = (SNMP_ASN1_CLASS_CONTEXT | SNMP_ASN1_CONTENTTYPE_CONSTRUCTED | SNMP_ASN1_CONTEXT_PDU_REPORT);
#if LWIP_SNMP_V3
request.request_id = request.msg_id;
#endif
}
if (err == ERR_OK) {
@ -789,8 +791,9 @@ snmp_parse_inbound_frame(struct snmp_request *request)
if (((s32_value != SNMP_VERSION_1) &&
(s32_value != SNMP_VERSION_2c)
#if LWIP_SNMP_V3
&& (s32_value != SNMP_VERSION_3))
&& (s32_value != SNMP_VERSION_3)
#endif
)
#if LWIP_SNMP_CONFIGURE_VERSIONS
|| (!snmp_version_enabled(s32_value))
#endif

2
src/apps/snmp/snmp_snmpv2_framework.c
View File

@ -4,7 +4,7 @@ Generated by LwipMibCompiler
#include "lwip/apps/snmp_opts.h"
#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
#if LWIP_SNMP && LWIP_SNMP_V3 /* don't build if not configured for use in lwipopts.h */
#include "lwip/apps/snmp_snmpv2_framework.h"
#include "lwip/apps/snmp.h"

2
src/apps/snmp/snmp_snmpv2_usm.c
View File

@ -3,7 +3,7 @@ Generated by LwipMibCompiler
*/
#include "lwip/apps/snmp_opts.h"
#if LWIP_SNMP
#if LWIP_SNMP && LWIP_SNMP_V3
#include "lwip/apps/snmp_snmpv2_usm.h"
#include "lwip/apps/snmp.h"

2
src/include/lwip/apps/snmp_core.h
View File

@ -351,14 +351,12 @@ struct snmp_statistics
u32_t outsetrequests;
u32_t outgetresponses;
u32_t outtraps;
#if LWIP_SNMP_V3
u32_t unsupportedseclevels;
u32_t notintimewindows;
u32_t unknownusernames;
u32_t unknownengineids;
u32_t wrongdigests;
u32_t decryptionerrors;
#endif
};
extern struct snmp_statistics snmp_stats;

2
src/include/lwip/apps/snmp_opts.h
View File

@ -279,7 +279,7 @@
* THIS IS UNDER DEVELOPMENT AND SHOULD NOT BE ENABLED IN PRODUCTS.
*/
#ifndef LWIP_SNMP_V3
#define LWIP_SNMP_V3 1
#define LWIP_SNMP_V3 0
#endif
#ifndef LWIP_SNMP_V3_MBEDTLS