aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bsnmpd
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2018-07-03 08:44:40 +0000
committerHartmut Brandt <harti@FreeBSD.org>2018-07-03 08:44:40 +0000
commit8e9b3e707151d136ec95e7f1d37556e39c1e228c (patch)
tree0bf4cf04b0aa2c25155c8b45a1704512517c9127 /usr.sbin/bsnmpd
parent4dc1b29b7169560aa0a16bb3488dac17325767f0 (diff)
downloadsrc-8e9b3e707151d136ec95e7f1d37556e39c1e228c.tar.gz
src-8e9b3e707151d136ec95e7f1d37556e39c1e228c.zip
Update bsnmp to version 1.13. This does not bring user-visible changes.
For developers gensnmptree can now generate functions for enums to convert between enums and strings and to check the validity of a value. The sources in FreeBSD are now in sync with the upstream which allows to bring in IPv6 modifications.
Notes
Notes: svn path=/head/; revision=335885
Diffstat (limited to 'usr.sbin/bsnmpd')
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile8
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_target/Makefile4
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_usm/Makefile4
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_vacm/Makefile4
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/Makefile1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c1
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c1
17 files changed, 20 insertions, 13 deletions
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index d23ee1d0d25a..24d583610993 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -123,7 +123,6 @@ BMIBSDIR= ${SHAREDIR}/snmp/mibs
DEFS= tree.def
DEFSDIR= ${SHAREDIR}/snmp/defs
-CFLAGS+= -DSNMPTREE_TYPES
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
LIBADD= begemot bsnmp
@@ -140,18 +139,15 @@ LIBADD+= wrap
.endif
oid.h: tree.def Makefile
- gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
+ gensnmptree -I${CONTRIB}/lib -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}
.ORDER: tree.c tree.h
tree.h: .NOMETA
tree.c tree.h: tree.def
- gensnmptree -l < ${.ALLSRC}
+ gensnmptree -I${CONTRIB}/lib -l -f < ${.ALLSRC}
MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \
-e 's%@DEFPATH@%${DEFSDIR}/%g' \
-e 's%@MIBSPATH@%${BMIBSDIR}/%g'
-NO_WCAST_ALIGN= yes
-WARNS?= 6
-
.include <bsd.prog.mk>
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
index 5d0afec43acb..d072c933074f 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/Makefile
@@ -5,7 +5,6 @@
MOD= bridge
SRCS= bridge_snmp.c bridge_if.c bridge_port.c bridge_addrs.c \
bridge_pf.c bridge_sys.c
-CFLAGS+= -DSNMPTREE_TYPES
XSYM= dot1dBridge newRoot topologyChange begemotBridgeNewRoot \
begemotBridgeTopologyChange begemotBridgeBaseName
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
index c4e969b888e8..ae106015b562 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
@@ -49,6 +49,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
index bbcfc0db09d5..a9986874b308 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
@@ -50,6 +50,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
#include "bridge_oid.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
index 8c07d330ed4a..650b16ff7714 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_pf.c
@@ -48,6 +48,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
index b948236bab69..021cf71a0157 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
@@ -49,6 +49,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
index cf8b36228893..65f7b8e85cc8 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.c
@@ -50,6 +50,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
#include "bridge_oid.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
index 4eff1f3c320f..d1ff91c124a6 100644
--- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
@@ -58,6 +58,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "bridge_tree.h"
#include "bridge_snmp.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
index 9d5fcf3dbcec..72213704e935 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
@@ -27,7 +27,6 @@ CFLAGS+=-DINET6
# This is needed to have WARNS > 1.
CFLAGS+=-DYY_NO_UNPUT
CFLAGS+=-DYY_NO_INPUT
-CFLAGS+= -DSNMPTREE_TYPES
LIBADD= util
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
index efe2e95071e6..fdf77191f706 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/Makefile
@@ -4,7 +4,6 @@
MOD= pf
SRCS= pf_snmp.c
-CFLAGS+= -DSNMPTREE_TYPES
XSYM= begemotPf
DEFS= ${MOD}_tree.def
diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
index 9666b0119d96..e79fc2dc24e5 100644
--- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c
@@ -43,6 +43,7 @@
#include <syslog.h>
#include <unistd.h>
+#define SNMPTREE_TYPES
#include "pf_oid.h"
#include "pf_tree.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_target/Makefile b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
index b25e9f872453..610e746541f7 100644
--- a/usr.sbin/bsnmpd/modules/snmp_target/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_target/Makefile
@@ -11,9 +11,11 @@ XSYM= snmpTargetMIB snmpNotificationMIB snmpUDPDomain
MAN= snmp_target.3
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
+CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
+GENSNMPTREEFLAGS+= -I${CONTRIB}/lib
+
DEFS= ${MOD}_tree.def
BMIBS=
diff --git a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
index f3c10fa61665..a5e8e8cf9237 100644
--- a/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_usm/Makefile
@@ -13,9 +13,11 @@ XSYM= snmpUsmMIB usmNoAuthProtocol usmHMACMD5AuthProtocol \
MAN= snmp_usm.3
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
+CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
+GENSNMPTREEFLAGS+= -I${CONTRIB}/lib
+
DEFS= ${MOD}_tree.def
BMIBS=
diff --git a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
index b0099fe344b8..d35842bb44f6 100644
--- a/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_vacm/Makefile
@@ -11,9 +11,11 @@ XSYM= snmpVacmMIB
MAN= snmp_vacm.3
-CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -DSNMPTREE_TYPES
+CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd
CFLAGS+= -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY -DHAVE_SYS_TREE_H
+GENSNMPTREEFLAGS+= -I${CONTRIB}/lib
+
DEFS= ${MOD}_tree.def
BMIBS=
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
index 6a53d46fb297..eb6b230210e9 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/Makefile
@@ -4,7 +4,6 @@
MOD= wlan
SRCS= wlan_snmp.c wlan_sys.c
-CFLAGS+= -DSNMPTREE_TYPES
XSYM= begemotWlan
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
index 09f6a86967ae..aa156a2f2321 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.c
@@ -52,6 +52,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "wlan_tree.h"
#include "wlan_snmp.h"
#include "wlan_oid.h"
diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
index 93e256621af4..c714f1fa4211 100644
--- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
+++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_sys.c
@@ -58,6 +58,7 @@
#include <bsnmp/snmpmod.h>
#include <bsnmp/snmp_mibII.h>
+#define SNMPTREE_TYPES
#include "wlan_tree.h"
#include "wlan_snmp.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 22:29:44 +0000