Adapt to new SNMPv2c agent

Disable private MIB for now since SNMP MIB API has changed

ports/Filelists.mk

@@ -34,7 +34,6 @@ CONTRIBAPPFILES=$(CONTRIBDIR)/apps/httpserver/httpserver-netconn.c \
 	$(CONTRIBDIR)/apps/udpecho/udpecho.c \
 	$(CONTRIBDIR)/apps/tcpecho/tcpecho.c \
 	$(CONTRIBDIR)/apps/shell/shell.c \
-	$(CONTRIBDIR)/apps/snmp_private_mib/lwip_prvmib.c \
 	$(CONTRIBDIR)/apps/tcpecho_raw/echo.c \
 	$(CONTRIBDIR)/apps/netio/netio.c \
 	$(CONTRIBDIR)/apps/ping/ping.c \

ports/unix/proj/minimal/lwipopts.h

@@ -287,8 +287,8 @@
  * transport.
  */
 #define LWIP_SNMP                       1
-#define SNMP_PRIVATE_MIB                1
-#define LWIP_MIB2_CALLBACKS             1
+#define SNMP_PRIVATE_MIB                0
+#define LWIP_MIB2_CALLBACKS             0
 #define MIB2_STATS                      1
 
 /*

ports/unix/proj/minimal/main.c

@@ -51,8 +51,10 @@
 #include "netif/tapif.h"
 #include "netif/etharp.h"
 
+#include "lwip/apps/snmp.h"
+#include "lwip/apps/snmp_mib2.h"
+
 #include "apps/tcpecho_raw/echo.h"
-#include "private_mib.h"
 
 /* (manual) host IP configuration */
 static ip4_addr_t ipaddr, netmask, gw;
@@ -67,12 +69,6 @@ static ip_addr_t trap_addr;
 unsigned char debug_flags;
 
 #if LWIP_SNMP
-/* 'non-volatile' SNMP settings
-  @todo: make these truly non-volatile */
-u8_t syscontact_str[255];
-u8_t syscontact_len = 0;
-u8_t syslocation_str[255];
-u8_t syslocation_len = 0;
 /* enable == 1, disable == 2 */
 u8_t snmpauthentraps_set = 2;
 #endif
@@ -188,11 +184,11 @@ main(int argc, char **argv)
   lwip_privmib_init();
 #endif
 #if LWIP_SNMP
-  snmp_trap_dst_ip_set(0,&trap_addr);
-  snmp_trap_dst_enable(0,trap_flag);
-  snmp_set_syscontact(syscontact_str,&syscontact_len,sizeof syscontact_str);
-  snmp_set_syslocation(syslocation_str,&syslocation_len,sizeof syslocation_str);
-  snmp_set_snmpenableauthentraps(&snmpauthentraps_set);
+  /* snmp_trap_dst_ip_set(0,&trap_addr); */
+  /* snmp_trap_dst_enable(0,trap_flag); */
+  snmp_mib2_set_syscontact_readonly((const u8_t*)"root", NULL);
+  snmp_mib2_set_syslocation_readonly((const u8_t*)"lwIP development PC", NULL);
+  /* snmp_set_snmpenableauthentraps(&snmpauthentraps_set); */
   snmp_init();
 #endif
 

ports/unix/proj/unixsim/lwipopts.h

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