Create the OID and tree files while building the modules and the daemon

instead of creating them by hand and storing them in the CVS tree. Add
gensnmptree to the bootstrap tools (it is used to generated these files).
This simplifies the update procedure.

Submitted by:	ru

11 files changed, 13 insertions, 453 deletions

diff --git a/lib/libbsnmp/modules/Makefile.inc b/lib/libbsnmp/modules/Makefile.inc
index aa49857..ebeb521 100644
--- a/lib/libbsnmp/modules/Makefile.inc
+++ b/lib/libbsnmp/modules/Makefile.inc
@@ -1,8 +1,16 @@
 # $FreeBSD$
 
 SHLIB_NAME=	snmp_${MOD}.so.${SHLIB_MAJOR}
-SRCS+=		${MOD}_tree.c
-CFLAGS+=	-I${CONTRIB}/lib -I${CONTRIB}/snmpd -I${.CURDIR}
+SRCS+=		${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
+CLEANFILES+=	${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h
+CFLAGS+=	-I${CONTRIB}/lib -I${CONTRIB}/snmpd -I.
+
+${MOD}_oid.h: ${MOD}_tree.def
+	gensnmptree -e ${XSYM} < ${.ALLSRC} > ${.TARGET}
+
+.ORDER: ${MOD}_tree.c ${MOD}_tree.h
+${MOD}_tree.c ${MOD}_tree.h: ${MOD}_tree.def
+	gensnmptree -l -p ${MOD}_ < ${.ALLSRC}
 
 .if defined(DEFS)
 FILESGROUPS+=	DEFS
diff --git a/lib/libbsnmp/modules/snmp_mibII/Makefile b/lib/libbsnmp/modules/snmp_mibII/Makefile
index 7215880..c677c53 100644
--- a/lib/libbsnmp/modules/snmp_mibII/Makefile
+++ b/lib/libbsnmp/modules/snmp_mibII/Makefile
@@ -9,6 +9,8 @@ MOD=	mibII
 SRCS=	mibII.c mibII_ifmib.c mibII_ip.c mibII_interfaces.c		\
 	mibII_ipaddr.c mibII_ifstack.c mibII_rcvaddr.c			\
 	mibII_nettomedia.c mibII_tcp.c mibII_udp.c mibII_route.c
+XSYM=	ipAddrTable ifTable ifRcvAddressEntry ifMIB ipMIB tcpMIB udpMIB	\
+	ipForward ifIndex linkDown linkUp
 MAN=	snmp_mibII.3
 
 DEFS=	${MOD}_tree.def
diff --git a/lib/libbsnmp/modules/snmp_mibII/genfiles b/lib/libbsnmp/modules/snmp_mibII/genfiles
deleted file mode 100644
index b797670..0000000
--- a/lib/libbsnmp/modules/snmp_mibII/genfiles
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-CONTRIB="../../../../contrib/bsnmp/snmp_mibII"
-
-XSYM="ipAddrTable ifTable ifRcvAddressEntry ifMIB ipMIB tcpMIB udpMIB	\
-	ipForward ifIndex linkDown linkUp"
-
-gensnmptree <${CONTRIB}/mibII_tree.def -e ${XSYM} >mibII_oid.h
-gensnmptree <${CONTRIB}/mibII_tree.def -l -p mibII_
-
-for i in mibII_tree.h mibII_tree.c mibII_oid.h ; do
-	ex $i <<'EOF'
-0a
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-.
-wq
-EOF
-done
diff --git a/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h b/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h
deleted file mode 100644
index 301f900..0000000
--- a/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-#define OID_ipAddrTable	20
-#define OIDLEN_ipAddrTable	8
-#define OIDX_ipAddrTable	{ 8, { 1, 3, 6, 1, 2, 1, 4, 20, } }
-#define OID_ifTable	2
-#define OIDLEN_ifTable	8
-#define OIDX_ifTable	{ 8, { 1, 3, 6, 1, 2, 1, 2, 2, } }
-#define OID_ifRcvAddressEntry	1
-#define OIDLEN_ifRcvAddressEntry	10
-#define OIDX_ifRcvAddressEntry	{ 10, { 1, 3, 6, 1, 2, 1, 31, 1, 4, 1, } }
-#define OID_ifMIB	31
-#define OIDLEN_ifMIB	7
-#define OIDX_ifMIB	{ 7, { 1, 3, 6, 1, 2, 1, 31, } }
-#define OID_ipMIB	48
-#define OIDLEN_ipMIB	7
-#define OIDX_ipMIB	{ 7, { 1, 3, 6, 1, 2, 1, 48, } }
-#define OID_tcpMIB	49
-#define OIDLEN_tcpMIB	7
-#define OIDX_tcpMIB	{ 7, { 1, 3, 6, 1, 2, 1, 49, } }
-#define OID_udpMIB	50
-#define OIDLEN_udpMIB	7
-#define OIDX_udpMIB	{ 7, { 1, 3, 6, 1, 2, 1, 50, } }
-#define OID_ipForward	24
-#define OIDLEN_ipForward	8
-#define OIDX_ipForward	{ 8, { 1, 3, 6, 1, 2, 1, 4, 24, } }
-#define OID_ifIndex	1
-#define OIDLEN_ifIndex	10
-#define OIDX_ifIndex	{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 1, } }
-#define OID_linkDown	3
-#define OIDLEN_linkDown	10
-#define OIDX_linkDown	{ 10, { 1, 3, 6, 1, 6, 3, 1, 1, 5, 3, } }
-#define OID_linkUp	4
-#define OIDLEN_linkUp	10
-#define OIDX_linkUp	{ 10, { 1, 3, 6, 1, 6, 3, 1, 1, 5, 4, } }
diff --git a/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c b/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c
deleted file mode 100644
index 3d8ecc8..0000000
--- a/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-#include <sys/types.h>
-#include <stdio.h>
-#include "asn1.h"
-#include "snmp.h"
-#include "snmpagent.h"
-#include "mibII_tree.h"
-
-const struct snmp_node mibII_ctree[] = {
-    {{ 8, { 1, 3, 6, 1, 2, 1, 2, 1, }}, "ifNumber", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_interfaces, 0, 0, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 1, }}, "ifIndex", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 2, }}, "ifDescr", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3, }}, "ifType", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 4, }}, "ifMtu", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 5, }}, "ifSpeed", SNMP_NODE_COLUMN, SNMP_SYNTAX_GAUGE, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 6, }}, "ifPhysAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 7, }}, "ifAdminStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifentry, 0|SNMP_NODE_CANSET, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 8, }}, "ifOperStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 9, }}, "ifLastChange", SNMP_NODE_COLUMN, SNMP_SYNTAX_TIMETICKS, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 10, }}, "ifInOctets", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 11, }}, "ifInUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 12, }}, "ifInNUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 13, }}, "ifInDiscards", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 14, }}, "ifInErrors", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 15, }}, "ifInUnknownProtos", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 16, }}, "ifOutOctets", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 17, }}, "ifOutUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 18, }}, "ifOutNUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 19, }}, "ifOutDiscards", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 20, }}, "ifOutErrors", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 21, }}, "ifOutQLen", SNMP_NODE_COLUMN, SNMP_SYNTAX_GAUGE, op_ifentry, 0, 0x11, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 2, 2, 1, 22, }}, "ifSpecific", SNMP_NODE_COLUMN, SNMP_SYNTAX_OID, op_ifentry, 0, 0x11, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 1, }}, "ipForwarding", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_ip, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 2, }}, "ipDefaultTTL", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_ip, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 3, }}, "ipInReceives", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 4, }}, "ipInHdrErrors", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 5, }}, "ipInAddrErrors", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 6, }}, "ipForwDatagrams", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 7, }}, "ipInUnknownProtos", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 8, }}, "ipInDiscards", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 9, }}, "ipInDelivers", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 10, }}, "ipOutRequests", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 11, }}, "ipOutDiscards", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 12, }}, "ipOutNoRoutes", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 13, }}, "ipReasmTimeout", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 14, }}, "ipReasmReqds", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 15, }}, "ipReasmOKs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 16, }}, "ipReasmFails", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 17, }}, "ipFragOKs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 18, }}, "ipFragFails", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 4, 19, }}, "ipFragCreates", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ipstat, 0, 0, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 20, 1, 1, }}, "ipAdEntAddr", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_ipaddr, 0, 0x41, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 20, 1, 2, }}, "ipAdEntIfIndex", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ipaddr, 0|SNMP_NODE_CANSET, 0x41, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 20, 1, 3, }}, "ipAdEntNetMask", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_ipaddr, 0|SNMP_NODE_CANSET, 0x41, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 20, 1, 4, }}, "ipAdEntBcastAddr", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ipaddr, 0|SNMP_NODE_CANSET, 0x41, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 20, 1, 5, }}, "ipAdEntReasmMaxSize", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ipaddr, 0, 0x41, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 22, 1, 1, }}, "ipNetToMediaIfIndex", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_nettomedia, 0, 0x412, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 22, 1, 2, }}, "ipNetToMediaPhysAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_nettomedia, 0, 0x412, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 22, 1, 3, }}, "ipNetToMediaNetAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_nettomedia, 0, 0x412, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 4, 22, 1, 4, }}, "ipNetToMediaType", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_nettomedia, 0, 0x412, NULL },
-    {{ 9, { 1, 3, 6, 1, 2, 1, 4, 24, 3, }}, "ipCidrRouteNumber", SNMP_NODE_LEAF, SNMP_SYNTAX_GAUGE, op_route, 0, 0, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 1, }}, "ipCidrRouteDest", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 2, }}, "ipCidrRouteMask", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 3, }}, "ipCidrRouteTos", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 4, }}, "ipCidrRouteNextHop", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 5, }}, "ipCidrRouteIfIndex", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 6, }}, "ipCidrRouteType", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 7, }}, "ipCidrRouteProto", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 8, }}, "ipCidrRouteAge", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 9, }}, "ipCidrRouteInfo", SNMP_NODE_COLUMN, SNMP_SYNTAX_OID, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 10, }}, "ipCidrRouteNextHopAS", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 11, }}, "ipCidrRouteMetric1", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 12, }}, "ipCidrRouteMetric2", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 13, }}, "ipCidrRouteMetric3", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 14, }}, "ipCidrRouteMetric4", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 15, }}, "ipCidrRouteMetric5", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 4, 24, 4, 1, 16, }}, "ipCidrRouteStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_route_table, 0, 0x41444, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 1, }}, "icmpInMsgs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 2, }}, "icmpInErrors", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 3, }}, "icmpInDestUnreachs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 4, }}, "icmpInTimeExcds", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 5, }}, "icmpInParmProbs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 6, }}, "icmpInSrcQuenchs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 7, }}, "icmpInRedirects", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 8, }}, "icmpInEchos", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 9, }}, "icmpInEchoReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 10, }}, "icmpInTimestamps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 11, }}, "icmpInTimestampReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 12, }}, "icmpInAddrMasks", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 13, }}, "icmpInAddrMaskReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 14, }}, "icmpOutMsgs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 15, }}, "icmpOutErrors", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 16, }}, "icmpOutDestUnreachs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 17, }}, "icmpOutTimeExcds", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 18, }}, "icmpOutParmProbs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 19, }}, "icmpOutSrcQuenchs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 20, }}, "icmpOutRedirects", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 21, }}, "icmpOutEchos", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 22, }}, "icmpOutEchoReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 23, }}, "icmpOutTimestamps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 24, }}, "icmpOutTimestampReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 25, }}, "icmpOutAddrMasks", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 5, 26, }}, "icmpOutAddrMaskReps", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_icmpstat, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 1, }}, "tcpRtoAlgorithm", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 2, }}, "tcpRtoMin", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 3, }}, "tcpRtoMax", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 4, }}, "tcpMaxConn", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 5, }}, "tcpActiveOpens", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 6, }}, "tcpPassiveOpens", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 7, }}, "tcpAttemptFails", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 8, }}, "tcpEstabResets", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 9, }}, "tcpCurrEstab", SNMP_NODE_LEAF, SNMP_SYNTAX_GAUGE, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 10, }}, "tcpInSegs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 11, }}, "tcpOutSegs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 12, }}, "tcpRetransSegs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 6, 13, 1, 1, }}, "tcpConnState", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_tcpconn, 0, 0x14144, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 6, 13, 1, 2, }}, "tcpConnLocalAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_tcpconn, 0, 0x14144, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 6, 13, 1, 3, }}, "tcpConnLocalPort", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_tcpconn, 0, 0x14144, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 6, 13, 1, 4, }}, "tcpConnRemAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_tcpconn, 0, 0x14144, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 6, 13, 1, 5, }}, "tcpConnRemPort", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_tcpconn, 0, 0x14144, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 6, 14, }}, "tcpInErrs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_tcp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 7, 1, }}, "udpInDatagrams", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_udp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 7, 2, }}, "udpNoPorts", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_udp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 7, 3, }}, "udpInErrors", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_udp, 0, 0, NULL },
-    {{ 8, { 1, 3, 6, 1, 2, 1, 7, 4, }}, "udpOutDatagrams", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_udp, 0, 0, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 7, 5, 1, 1, }}, "udpLocalAddress", SNMP_NODE_COLUMN, SNMP_SYNTAX_IPADDRESS, op_udptable, 0, 0x142, NULL },
-    {{ 10, { 1, 3, 6, 1, 2, 1, 7, 5, 1, 2, }}, "udpLocalPort", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_udptable, 0, 0x142, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 1, }}, "ifName", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 2, }}, "ifInMulticastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 3, }}, "ifInBroadcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 4, }}, "ifOutMulticastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 5, }}, "ifOutBroadcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 6, }}, "ifHCInOctets", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 7, }}, "ifHCInUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 8, }}, "ifHCInMulticastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 9, }}, "ifHCInBroadcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 10, }}, "ifHCOutOctets", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 11, }}, "ifHCOutUcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 12, }}, "ifHCOutMulticastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 13, }}, "ifHCOutBroadcastPkts", SNMP_NODE_COLUMN, SNMP_SYNTAX_COUNTER64, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 14, }}, "ifLinkUpDownTrapEnable", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifxtable, 0|SNMP_NODE_CANSET, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 15, }}, "ifHighSpeed", SNMP_NODE_COLUMN, SNMP_SYNTAX_GAUGE, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 16, }}, "ifPromiscuousMode", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifxtable, 0|SNMP_NODE_CANSET, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 17, }}, "ifConnectorPresent", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 18, }}, "ifAlias", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 1, 1, 19, }}, "ifCounterDiscontinuityTime", SNMP_NODE_COLUMN, SNMP_SYNTAX_TIMETICKS, op_ifxtable, 0, 0x11, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 2, 1, 3, }}, "ifStackStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ifstack, 0, 0x112, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 4, 1, 2, }}, "ifRcvAddressStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_rcvaddr, 0, 0x212, NULL },
-    {{ 11, { 1, 3, 6, 1, 2, 1, 31, 1, 4, 1, 3, }}, "ifRcvAddressType", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_rcvaddr, 0, 0x212, NULL },
-    {{ 9, { 1, 3, 6, 1, 2, 1, 31, 1, 5, }}, "ifTableLastChange", SNMP_NODE_LEAF, SNMP_SYNTAX_TIMETICKS, op_ifmib, 0, 0, NULL },
-    {{ 9, { 1, 3, 6, 1, 2, 1, 31, 1, 6, }}, "ifStackLastChange", SNMP_NODE_LEAF, SNMP_SYNTAX_TIMETICKS, op_ifmib, 0, 0, NULL },
-};
-
diff --git a/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h b/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h
deleted file mode 100644
index e19ac3c..0000000
--- a/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-int	op_interfaces(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifNumber 1
-int	op_ifentry(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifIndex 1
-# define LEAF_ifDescr 2
-# define LEAF_ifType 3
-# define LEAF_ifMtu 4
-# define LEAF_ifSpeed 5
-# define LEAF_ifPhysAddress 6
-# define LEAF_ifAdminStatus 7
-# define LEAF_ifOperStatus 8
-# define LEAF_ifLastChange 9
-# define LEAF_ifInOctets 10
-# define LEAF_ifInUcastPkts 11
-# define LEAF_ifInNUcastPkts 12
-# define LEAF_ifInDiscards 13
-# define LEAF_ifInErrors 14
-# define LEAF_ifInUnknownProtos 15
-# define LEAF_ifOutOctets 16
-# define LEAF_ifOutUcastPkts 17
-# define LEAF_ifOutNUcastPkts 18
-# define LEAF_ifOutDiscards 19
-# define LEAF_ifOutErrors 20
-# define LEAF_ifOutQLen 21
-# define LEAF_ifSpecific 22
-int	op_ip(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipForwarding 1
-# define LEAF_ipDefaultTTL 2
-int	op_ipstat(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipInReceives 3
-# define LEAF_ipInHdrErrors 4
-# define LEAF_ipInAddrErrors 5
-# define LEAF_ipForwDatagrams 6
-# define LEAF_ipInUnknownProtos 7
-# define LEAF_ipInDiscards 8
-# define LEAF_ipInDelivers 9
-# define LEAF_ipOutRequests 10
-# define LEAF_ipOutDiscards 11
-# define LEAF_ipOutNoRoutes 12
-# define LEAF_ipReasmTimeout 13
-# define LEAF_ipReasmReqds 14
-# define LEAF_ipReasmOKs 15
-# define LEAF_ipReasmFails 16
-# define LEAF_ipFragOKs 17
-# define LEAF_ipFragFails 18
-# define LEAF_ipFragCreates 19
-int	op_ipaddr(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipAdEntAddr 1
-# define LEAF_ipAdEntIfIndex 2
-# define LEAF_ipAdEntNetMask 3
-# define LEAF_ipAdEntBcastAddr 4
-# define LEAF_ipAdEntReasmMaxSize 5
-int	op_nettomedia(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipNetToMediaIfIndex 1
-# define LEAF_ipNetToMediaPhysAddress 2
-# define LEAF_ipNetToMediaNetAddress 3
-# define LEAF_ipNetToMediaType 4
-int	op_route(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipCidrRouteNumber 3
-int	op_route_table(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ipCidrRouteDest 1
-# define LEAF_ipCidrRouteMask 2
-# define LEAF_ipCidrRouteTos 3
-# define LEAF_ipCidrRouteNextHop 4
-# define LEAF_ipCidrRouteIfIndex 5
-# define LEAF_ipCidrRouteType 6
-# define LEAF_ipCidrRouteProto 7
-# define LEAF_ipCidrRouteAge 8
-# define LEAF_ipCidrRouteInfo 9
-# define LEAF_ipCidrRouteNextHopAS 10
-# define LEAF_ipCidrRouteMetric1 11
-# define LEAF_ipCidrRouteMetric2 12
-# define LEAF_ipCidrRouteMetric3 13
-# define LEAF_ipCidrRouteMetric4 14
-# define LEAF_ipCidrRouteMetric5 15
-# define LEAF_ipCidrRouteStatus 16
-int	op_icmpstat(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_icmpInMsgs 1
-# define LEAF_icmpInErrors 2
-# define LEAF_icmpInDestUnreachs 3
-# define LEAF_icmpInTimeExcds 4
-# define LEAF_icmpInParmProbs 5
-# define LEAF_icmpInSrcQuenchs 6
-# define LEAF_icmpInRedirects 7
-# define LEAF_icmpInEchos 8
-# define LEAF_icmpInEchoReps 9
-# define LEAF_icmpInTimestamps 10
-# define LEAF_icmpInTimestampReps 11
-# define LEAF_icmpInAddrMasks 12
-# define LEAF_icmpInAddrMaskReps 13
-# define LEAF_icmpOutMsgs 14
-# define LEAF_icmpOutErrors 15
-# define LEAF_icmpOutDestUnreachs 16
-# define LEAF_icmpOutTimeExcds 17
-# define LEAF_icmpOutParmProbs 18
-# define LEAF_icmpOutSrcQuenchs 19
-# define LEAF_icmpOutRedirects 20
-# define LEAF_icmpOutEchos 21
-# define LEAF_icmpOutEchoReps 22
-# define LEAF_icmpOutTimestamps 23
-# define LEAF_icmpOutTimestampReps 24
-# define LEAF_icmpOutAddrMasks 25
-# define LEAF_icmpOutAddrMaskReps 26
-int	op_tcp(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_tcpRtoAlgorithm 1
-# define LEAF_tcpRtoMin 2
-# define LEAF_tcpRtoMax 3
-# define LEAF_tcpMaxConn 4
-# define LEAF_tcpActiveOpens 5
-# define LEAF_tcpPassiveOpens 6
-# define LEAF_tcpAttemptFails 7
-# define LEAF_tcpEstabResets 8
-# define LEAF_tcpCurrEstab 9
-# define LEAF_tcpInSegs 10
-# define LEAF_tcpOutSegs 11
-# define LEAF_tcpRetransSegs 12
-int	op_tcpconn(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_tcpConnState 1
-# define LEAF_tcpConnLocalAddress 2
-# define LEAF_tcpConnLocalPort 3
-# define LEAF_tcpConnRemAddress 4
-# define LEAF_tcpConnRemPort 5
-# define LEAF_tcpInErrs 14
-int	op_udp(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_udpInDatagrams 1
-# define LEAF_udpNoPorts 2
-# define LEAF_udpInErrors 3
-# define LEAF_udpOutDatagrams 4
-int	op_udptable(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_udpLocalAddress 1
-# define LEAF_udpLocalPort 2
-int	op_ifxtable(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifName 1
-# define LEAF_ifInMulticastPkts 2
-# define LEAF_ifInBroadcastPkts 3
-# define LEAF_ifOutMulticastPkts 4
-# define LEAF_ifOutBroadcastPkts 5
-# define LEAF_ifHCInOctets 6
-# define LEAF_ifHCInUcastPkts 7
-# define LEAF_ifHCInMulticastPkts 8
-# define LEAF_ifHCInBroadcastPkts 9
-# define LEAF_ifHCOutOctets 10
-# define LEAF_ifHCOutUcastPkts 11
-# define LEAF_ifHCOutMulticastPkts 12
-# define LEAF_ifHCOutBroadcastPkts 13
-# define LEAF_ifLinkUpDownTrapEnable 14
-# define LEAF_ifHighSpeed 15
-# define LEAF_ifPromiscuousMode 16
-# define LEAF_ifConnectorPresent 17
-# define LEAF_ifAlias 18
-# define LEAF_ifCounterDiscontinuityTime 19
-int	op_ifstack(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifStackStatus 3
-int	op_rcvaddr(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifRcvAddressStatus 2
-# define LEAF_ifRcvAddressType 3
-int	op_ifmib(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_ifTableLastChange 5
-# define LEAF_ifStackLastChange 6
-#define mibII_CTREE_SIZE 142
-extern const struct snmp_node mibII_ctree[];
diff --git a/lib/libbsnmp/modules/snmp_netgraph/Makefile b/lib/libbsnmp/modules/snmp_netgraph/Makefile
index 3760c5d..6c3cfb4 100644
--- a/lib/libbsnmp/modules/snmp_netgraph/Makefile
+++ b/lib/libbsnmp/modules/snmp_netgraph/Makefile
@@ -6,6 +6,7 @@ CONTRIB=${.CURDIR}/../../../../contrib/bsnmp
 
 MOD=	netgraph
 SRCS=	snmp_netgraph.c
+XSYM=	begemotNg
 MAN=	snmp_netgraph.3
 
 MIBS=	BEGEMOT-NETGRAPH.txt
diff --git a/lib/libbsnmp/modules/snmp_netgraph/genfiles b/lib/libbsnmp/modules/snmp_netgraph/genfiles
deleted file mode 100644
index b92a392..0000000
--- a/lib/libbsnmp/modules/snmp_netgraph/genfiles
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-XSYM="begemotNg"
-
-gensnmptree <netgraph_tree.def -e ${XSYM} >netgraph_oid.h
-gensnmptree <netgraph_tree.def -l -p netgraph_
-
-for i in netgraph_tree.h netgraph_tree.c netgraph_oid.h ; do
-	ex $i <<'EOF'
-0a
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-.
-wq
-EOF
-done
diff --git a/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h b/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h
deleted file mode 100644
index 5be1a16..0000000
--- a/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-#define OID_begemotNg	2
-#define OIDLEN_begemotNg	9
-#define OIDX_begemotNg	{ 9, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, } }
diff --git a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c b/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c
deleted file mode 100644
index 4b249f0..0000000
--- a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-#include <sys/types.h>
-#include <stdio.h>
-#include "asn1.h"
-#include "snmp.h"
-#include "snmpagent.h"
-#include "netgraph_tree.h"
-
-const struct snmp_node netgraph_ctree[] = {
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 1, 1, }}, "begemotNgControlNodeName", SNMP_NODE_LEAF, SNMP_SYNTAX_OCTETSTRING, op_ng_config, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 1, 2, }}, "begemotNgResBufSiz", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_ng_config, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 1, 3, }}, "begemotNgTimeout", SNMP_NODE_LEAF, SNMP_SYNTAX_INTEGER, op_ng_config, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 1, 4, }}, "begemotNgDebugLevel", SNMP_NODE_LEAF, SNMP_SYNTAX_GAUGE, op_ng_config, 0|SNMP_NODE_CANSET, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 2, 1, }}, "begemotNgNoMems", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ng_stats, 0, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 2, 2, }}, "begemotNgMsgReadErrs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ng_stats, 0, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 2, 3, }}, "begemotNgTooLargeMsgs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ng_stats, 0, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 2, 4, }}, "begemotNgDataReadErrs", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ng_stats, 0, 0, NULL },
-    {{ 12, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 2, 5, }}, "begemotNgTooLargeDatas", SNMP_NODE_LEAF, SNMP_SYNTAX_COUNTER, op_ng_stats, 0, 0, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 3, 1, 2, }}, "begemotNgTypeStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ng_type, 0|SNMP_NODE_CANSET, 0x21, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 4, 1, 2, }}, "begemotNgNodeStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ng_node, 0, 0x11, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 4, 1, 3, }}, "begemotNgNodeName", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ng_node, 0, 0x11, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 4, 1, 4, }}, "begemotNgNodeType", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ng_node, 0, 0x11, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 4, 1, 5, }}, "begemotNgNodeHooks", SNMP_NODE_COLUMN, SNMP_SYNTAX_GAUGE, op_ng_node, 0, 0x11, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 5, 1, 3, }}, "begemotNgHookStatus", SNMP_NODE_COLUMN, SNMP_SYNTAX_INTEGER, op_ng_hook, 0, 0x262, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 5, 1, 4, }}, "begemotNgHookPeerNodeId", SNMP_NODE_COLUMN, SNMP_SYNTAX_GAUGE, op_ng_hook, 0, 0x262, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 5, 1, 5, }}, "begemotNgHookPeerHook", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ng_hook, 0, 0x262, NULL },
-    {{ 13, { 1, 3, 6, 1, 4, 1, 12325, 1, 2, 1, 5, 1, 6, }}, "begemotNgHookPeerType", SNMP_NODE_COLUMN, SNMP_SYNTAX_OCTETSTRING, op_ng_hook, 0, 0x262, NULL },
-};
-
diff --git a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h b/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h
deleted file mode 100644
index 5b6d3f6..0000000
--- a/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $FreeBSD$ */
-/* generated file, don't edit - use ./genfiles */
-int	op_ng_config(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_begemotNgControlNodeName 1
-# define LEAF_begemotNgResBufSiz 2
-# define LEAF_begemotNgTimeout 3
-# define LEAF_begemotNgDebugLevel 4
-int	op_ng_stats(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_begemotNgNoMems 1
-# define LEAF_begemotNgMsgReadErrs 2
-# define LEAF_begemotNgTooLargeMsgs 3
-# define LEAF_begemotNgDataReadErrs 4
-# define LEAF_begemotNgTooLargeDatas 5
-int	op_ng_type(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_begemotNgTypeStatus 2
-int	op_ng_node(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_begemotNgNodeStatus 2
-# define LEAF_begemotNgNodeName 3
-# define LEAF_begemotNgNodeType 4
-# define LEAF_begemotNgNodeHooks 5
-int	op_ng_hook(struct snmp_context *, struct snmp_value *, u_int, u_int, enum snmp_op);
-# define LEAF_begemotNgHookStatus 3
-# define LEAF_begemotNgHookPeerNodeId 4
-# define LEAF_begemotNgHookPeerHook 5
-# define LEAF_begemotNgHookPeerType 6
-#define netgraph_CTREE_SIZE 18
-extern const struct snmp_node netgraph_ctree[];