Virgin import of bsnmpd 1.10

9 files changed, 31 insertions, 27 deletions

diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c
index f6760dc..5c7a914 100644
--- a/contrib/bsnmp/snmp_mibII/mibII.c
+++ b/contrib/bsnmp/snmp_mibII/mibII.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.21 2005/02/25 16:04:41 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.22 2005/05/23 09:03:37 brandt_h Exp $
  *
  * Implementation of the standard interfaces and ip MIB.
  */
@@ -85,10 +85,10 @@ struct mibarp_list mibarp_list = TAILQ_HEAD_INITIALIZER(mibarp_list);
 int32_t mib_if_number;
 
 /* last change of table */
-uint32_t mib_iftable_last_change;
+uint64_t mib_iftable_last_change;
 
 /* last change of stack table */
-uint32_t mib_ifstack_last_change;
+uint64_t mib_ifstack_last_change;
 
 /* if this is set, one of our lists may be bad. refresh them when idle */
 int mib_iflist_bad;
@@ -97,7 +97,7 @@ int mib_iflist_bad;
 int mib_netsock;
 
 /* last time refreshed */
-uint32_t mibarpticks;
+uint64_t mibarpticks;
 
 /* info on system clocks */
 struct clockinfo clockinfo;
diff --git a/contrib/bsnmp/snmp_mibII/mibII.h b/contrib/bsnmp/snmp_mibII/mibII.h
index d67fff7..7a83df4 100644
--- a/contrib/bsnmp/snmp_mibII/mibII.h
+++ b/contrib/bsnmp/snmp_mibII/mibII.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.13 2004/08/06 08:46:59 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII.h,v 1.14 2005/05/23 09:03:38 brandt_h Exp $
  *
  * Implementation of the interfaces and IP groups of MIB-II.
  */
@@ -179,16 +179,16 @@ extern struct mibarp_list mibarp_list;
 extern int32_t mib_if_number;
 
 /* last change of interface table */
-extern uint32_t mib_iftable_last_change;
+extern uint64_t mib_iftable_last_change;
 
 /* last change of stack table */
-extern uint32_t mib_ifstack_last_change;
+extern uint64_t mib_ifstack_last_change;
 
 /* if this is set, one of our lists may be bad. refresh them when idle */
 extern int mib_iflist_bad;
 
 /* last time refreshed */
-extern uint32_t mibarpticks;
+extern uint64_t mibarpticks;
 
 /* info on system clocks */
 extern struct clockinfo clockinfo;
diff --git a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
index ffe94fd..1c08260 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.14 2005/02/25 16:04:42 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.15 2005/05/23 09:03:39 brandt_h Exp $
  *
  * Interfaces group.
  */
@@ -135,13 +135,17 @@ ifchange_func(struct snmp_context *ctx __unused, struct snmp_dependency *dep,
 	abort();
 }
 
+/*
+ * Return difference to daemon start time in ticks truncated to a
+ * 32-bit value. If the timeval is 0 then return 0.
+ */
 static uint32_t
 ticks_get_timeval(struct timeval *tv)
 {
-	uint32_t v;
+	uint64_t v;
 
 	if (tv->tv_sec != 0 || tv->tv_usec != 0) {
-		v = 100 * tv->tv_sec + tv->tv_usec / 10000;
+		v = 100ULL * tv->tv_sec + tv->tv_usec / 10000ULL;
 		if (v > start_tick)
 			return (v - start_tick);
 	}
diff --git a/contrib/bsnmp/snmp_mibII/mibII_ip.c b/contrib/bsnmp/snmp_mibII/mibII_ip.c
index 3211995..11efe82 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_ip.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_ip.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_ip.c,v 1.10 2004/08/06 08:47:01 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_ip.c,v 1.11 2005/05/23 09:03:40 brandt_h Exp $
  *
  * ip group scalars.
  */
@@ -44,9 +44,9 @@ static struct icmpstat icmpstat;
 
 static int	ip_forwarding;
 static int	ip_defttl;
-static uint32_t ip_tick;
+static uint64_t ip_tick;
 
-static uint32_t ipstat_tick;
+static uint64_t ipstat_tick;
 
 static int
 fetch_ipstat(void)
diff --git a/contrib/bsnmp/snmp_mibII/mibII_route.c b/contrib/bsnmp/snmp_mibII/mibII_route.c
index bf02a6c..9375be3 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_route.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_route.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.5 2004/08/06 08:47:04 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_route.c,v 1.6 2005/05/23 09:03:41 brandt_h Exp $
  *
  * Routing table
  */
@@ -42,7 +42,7 @@ struct sroute {
 };
 static TAILQ_HEAD(, sroute) sroute_list = TAILQ_HEAD_INITIALIZER(sroute_list);
 
-static uint32_t route_tick;
+static uint64_t route_tick;
 static u_int route_total;
 
 static int
diff --git a/contrib/bsnmp/snmp_mibII/mibII_tcp.c b/contrib/bsnmp/snmp_mibII/mibII_tcp.c
index a8e95c8..561216f 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_tcp.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_tcp.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_tcp.c,v 1.6 2004/08/06 08:47:04 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_tcp.c,v 1.7 2005/05/23 09:03:42 brandt_h Exp $
  *
  * tcp
  */
@@ -44,7 +44,7 @@ struct tcp_index {
 	struct xtcpcb	*tp;
 };
 
-static uint32_t tcp_tick;
+static uint64_t tcp_tick;
 static struct tcpstat tcpstat;
 static struct xinpgen *xinpgen;
 static size_t xinpgen_len;
diff --git a/contrib/bsnmp/snmp_mibII/mibII_udp.c b/contrib/bsnmp/snmp_mibII/mibII_udp.c
index 442cc84..08e3dd1 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_udp.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_udp.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_udp.c,v 1.6 2004/08/06 08:47:05 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_udp.c,v 1.7 2005/05/23 09:03:42 brandt_h Exp $
  *
  * udp
  */
@@ -43,7 +43,7 @@ struct udp_index {
 	struct xinpcb	*inp;
 };
 
-static uint32_t udp_tick;
+static uint64_t udp_tick;
 static struct udpstat udpstat;
 static struct xinpgen *xinpgen;
 static size_t xinpgen_len;
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.3 b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
index b87a69c..64ce6af 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.3
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
@@ -26,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/snmp_mibII/snmp_mibII.3,v 1.6 2005/02/28 16:00:11 brandt_h Exp $
+.\" $Begemot: bsnmp/snmp_mibII/snmp_mibII.3,v 1.7 2005/05/23 09:11:21 brandt_h Exp $
 .\"
-.Dd August 19, 2002
+.Dd May 23, 2005
 .Dt SNMP_MIBII 3
 .Os
 .Sh NAME
@@ -140,14 +140,14 @@ struct mibif {
 	char		name[IFNAMSIZ];
 	char		descr[256];
 	struct ifmibdata mib;
-	u_int32_t	mibtick;
+	uint64_t	mibtick;
 	void		*specmib;
 	size_t		specmiblen;
 	u_char		*physaddr;
 	u_int		physaddrlen;
 	int		has_connector;
 	int		trap_enable;
-	u_int32_t	counter_disc;
+	uint64_t	counter_disc;
 	mibif_notify_f	xnotify;
 	void		*xnotify_data;
 	const struct lmodule *xnotify_mod;
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.h b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
index 569c115..98f2a72 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.h
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.16 2005/02/25 16:04:43 brandt_h Exp $
+ * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.17 2005/05/23 09:03:43 brandt_h Exp $
  *
  * Implementation of the interfaces and IP groups of MIB-II.
  */
@@ -58,14 +58,14 @@ struct mibif {
 	char		name[IFNAMSIZ];
 	char		descr[256];
 	struct ifmibdata mib;
-	u_int32_t	mibtick;
+	uint64_t	mibtick;
 	void		*specmib;
 	size_t		specmiblen;
 	u_char		*physaddr;
 	u_int		physaddrlen;
 	int		has_connector;
 	int		trap_enable;
-	u_int32_t	counter_disc;
+	uint64_t	counter_disc;
 
 	/*
 	 * This is needed to handle interface type specific information