From 4ef21e25975a6544a0ed534f7034b1a27cec0b39 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Wed, 1 Mar 2017 20:23:55 +0100
Subject: [PATCH] Fix compile when SNMPv3 is disabled

---
 src/apps/snmp/snmp_msg.c              | 5 ++++-
 src/apps/snmp/snmp_snmpv2_framework.c | 2 +-
 src/apps/snmp/snmp_snmpv2_usm.c       | 2 +-
 src/include/lwip/apps/snmp_core.h     | 2 --
 src/include/lwip/apps/snmp_opts.h     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/apps/snmp/snmp_msg.c b/src/apps/snmp/snmp_msg.c
index 1c4cb1a4..84b654e5 100644
--- a/src/apps/snmp/snmp_msg.c
+++ b/src/apps/snmp/snmp_msg.c
@@ -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
diff --git a/src/apps/snmp/snmp_snmpv2_framework.c b/src/apps/snmp/snmp_snmpv2_framework.c
index 4fbbd7e3..331aa29d 100644
--- a/src/apps/snmp/snmp_snmpv2_framework.c
+++ b/src/apps/snmp/snmp_snmpv2_framework.c
@@ -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"
diff --git a/src/apps/snmp/snmp_snmpv2_usm.c b/src/apps/snmp/snmp_snmpv2_usm.c
index a8d70d86..32f5cf6e 100644
--- a/src/apps/snmp/snmp_snmpv2_usm.c
+++ b/src/apps/snmp/snmp_snmpv2_usm.c
@@ -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"
diff --git a/src/include/lwip/apps/snmp_core.h b/src/include/lwip/apps/snmp_core.h
index e173f507..6daffdf7 100644
--- a/src/include/lwip/apps/snmp_core.h
+++ b/src/include/lwip/apps/snmp_core.h
@@ -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;
diff --git a/src/include/lwip/apps/snmp_opts.h b/src/include/lwip/apps/snmp_opts.h
index 96756e53..67d2cdd5 100644
--- a/src/include/lwip/apps/snmp_opts.h
+++ b/src/include/lwip/apps/snmp_opts.h
@@ -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