Adapt to SNMP moving/renaming in lwIP

ports/Filelists.mk

@@ -45,9 +45,9 @@ CORE6FILES=$(LWIPDIR)/core/ipv6/dhcp6.c $(LWIPDIR)/core/ipv6/ethip6.c \
 	$(LWIPDIR)/core/ipv6/mld6.c $(LWIPDIR)/core/ipv6/nd6.c
 
 # SNMPFILES: Extra SNMPv1 agent
-SNMPFILES=$(LWIPDIR)/core/snmp/asn1_dec.c $(LWIPDIR)/core/snmp/asn1_enc.c \
-	$(LWIPDIR)/core/snmp/mib2.c $(LWIPDIR)/core/snmp/mib_structs.c \
-	$(LWIPDIR)/core/snmp/msg_in.c $(LWIPDIR)/core/snmp/msg_out.c
+SNMPFILES=$(LWIPDIR)/apps/snmp/asn1_dec.c $(LWIPDIR)/apps/snmp/asn1_enc.c \
+	$(LWIPDIR)/apps/snmp/mib2.c $(LWIPDIR)/apps/snmp/mib_structs.c \
+	$(LWIPDIR)/apps/snmp/msg_in.c $(LWIPDIR)/apps/snmp/msg_out.c
 
 # APIFILES: The files which implement the sequential and socket APIs.
 APIFILES=$(LWIPDIR)/api/api_lib.c $(LWIPDIR)/api/api_msg.c $(LWIPDIR)/api/err.c \

ports/unix/netif/tapif.c

@@ -49,7 +49,7 @@
 #include "lwip/ip.h"
 #include "lwip/mem.h"
 #include "lwip/stats.h"
-#include "lwip/snmp_mib2.h"
+#include "lwip/snmp.h"
 #include "lwip/pbuf.h"
 #include "lwip/sys.h"
 #include "lwip/timers.h"

ports/unix/proj/unixsim/lwipopts.h

@@ -222,13 +222,11 @@ extern void sntp_set_system_time(u32_t sec);
 /* ---------- SNMP options ---------- */
 /** @todo SNMP is experimental for now
     @note UDP must be available for SNMP transport */
-#ifndef LWIP_SNMP
 #define LWIP_SNMP               1
-#endif
+#define LWIP_MIB2_CALLBACKS     LWIP_SNMP
+#define MIB2_STATS              LWIP_SNMP
 
-#ifndef SNMP_PRIVATE_MIB
 #define SNMP_PRIVATE_MIB        0
-#endif
 
 /* ---------- DNS options ---------- */
 #define LWIP_DNS                1

ports/unix/proj/unixsim/simhost.c

@@ -81,6 +81,7 @@
 #include "shell.h"
 #include "lwip/apps/netbiosns.h"
 #include "lwip/apps/sntp.h"
+#include "lwip/apps/snmp.h"
 
 #if LWIP_RAW
 #include "lwip/icmp.h"
@@ -184,6 +185,8 @@ tcpip_init_done(void *arg)
 #endif /* LWIP_DHCP */
   sntp_init();
 
+  snmp_init();
+  
   sys_sem_signal(sem);
 }