carp stats cleanup:

- convert counters to 64 bits
- remove junk from netstat

ok pb@

2 files changed, 31 insertions, 34 deletions

diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 8bcae90c68c..a9799249616 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.h,v 1.5 2004/04/28 00:28:43 mcbride Exp $	*/
+/*	$OpenBSD: ip_carp.h,v 1.6 2004/04/28 01:53:45 mcbride Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -63,24 +63,24 @@ struct carp_header {
  * Statistics.
  */
 struct carpstats {
-	u_long	carps_ipackets;		/* total input packets, IPv4 */
-	u_long	carps_ipackets6;	/* total input packets, IPv6 */
-	u_long	carps_badif;		/* wrong interface */
-	u_long	carps_badttl;		/* TTL is not CARP_DFLTTL */
-	u_long	carps_hdrops;		/* packets shorter than header */
-	u_long	carps_badsum;		/* bad checksum */
-	u_long	carps_badver;		/* bad (incl unsupp) version */
-	u_long	carps_badlen;		/* data length does not match */
-	u_long	carps_badauth;		/* bad authentication */
-	u_long	carps_badvhid;		/* bad VHID */
-	u_long	carps_badaddrs;		/* bad address list */
+	u_int64_t	carps_ipackets;		/* total input packets, IPv4 */
+	u_int64_t	carps_ipackets6;	/* total input packets, IPv6 */
+	u_int64_t	carps_badif;		/* wrong interface */
+	u_int64_t	carps_badttl;		/* TTL is not CARP_DFLTTL */
+	u_int64_t	carps_hdrops;		/* packets shorter than hdr */
+	u_int64_t	carps_badsum;		/* bad checksum */
+	u_int64_t	carps_badver;		/* bad (incl unsupp) version */
+	u_int64_t	carps_badlen;		/* data length does not match */
+	u_int64_t	carps_badauth;		/* bad authentication */
+	u_int64_t	carps_badvhid;		/* bad VHID */
+	u_int64_t	carps_badaddrs;		/* bad address list */
 
-	u_long	carps_opackets;		/* total output packets, IPv4 */
-	u_long	carps_opackets6;	/* total output packets, IPv6 */
-	u_long	carps_onomem;		/* no memory for an mbuf for a send */
-	u_long	carps_ostates;		/* total state updates sent */
+	u_int64_t	carps_opackets;		/* total output packets, IPv4 */
+	u_int64_t	carps_opackets6;	/* total output packets, IPv6 */
+	u_int64_t	carps_onomem;		/* no memory for an mbuf */
+	u_int64_t	carps_ostates;		/* total state updates sent */
 
-	u_long	carps_preempt;		/* if enabled, high-pri preemptions */
+	u_int64_t	carps_preempt;		/* if enabled, preemptions */
 };
 
 /*
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 379ddc3c65d..75c39675f14 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.86 2004/04/28 00:47:06 mcbride Exp $	*/
+/*	$OpenBSD: inet.c,v 1.87 2004/04/28 01:53:45 mcbride Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c	8.4 (Berkeley) 4/20/94";
 #else
-static const char *rcsid = "$OpenBSD: inet.c,v 1.86 2004/04/28 00:47:06 mcbride Exp $";
+static const char *rcsid = "$OpenBSD: inet.c,v 1.87 2004/04/28 01:53:45 mcbride Exp $";
 #endif
 #endif /* not lint */
 
@@ -895,21 +895,18 @@ carp_stats(u_long off, char *name)
 #define p2(f, m) if (carpstat.f || sflag <= 1) \
 	printf(m, carpstat.f)
 
-	p(carps_ipackets, "\t%lu packet%s received (IPv4)\n");
-	p(carps_ipackets6, "\t%lu packet%s received (IPv6)\n");
-	p(carps_badif, "\t\t%lu packet%s discarded for bad interface\n");
-	p(carps_hdrops, "\t\t%lu packet%s shorter than header\n");
-	p(carps_badsum, "\t\t%lu discarded for bad checksum%s\n");
-	p(carps_badver,	"\t\t%lu discarded packet%s with a bad version\n");
-	p2(carps_badlen, "\t\t%lu discarded because packet too short\n");
-	p2(carps_badauth, "\t\t%lu discarded for bad authentication\n");
-	p2(carps_badvhid, "\t\t%lu discarded for bad vhid\n");
-	p2(carps_badaddrs, "\t\t%lu discarded because of a bad address list\n");
-	p(carps_opackets, "\t%lu packet%s sent (IPv4)\n");
-	p(carps_opackets6, "\t%lu packet%s sent (IPv6)\n");
-#if notyet
-	p(carps_ostates, "\t\t%s state update%s sent\n");
-#endif
+	p(carps_ipackets, "\t%llu packet%s received (IPv4)\n");
+	p(carps_ipackets6, "\t%llu packet%s received (IPv6)\n");
+	p(carps_badif, "\t\t%llu packet%s discarded for bad interface\n");
+	p(carps_hdrops, "\t\t%llu packet%s shorter than header\n");
+	p(carps_badsum, "\t\t%llu discarded for bad checksum%s\n");
+	p(carps_badver,	"\t\t%llu discarded packet%s with a bad version\n");
+	p2(carps_badlen, "\t\t%llu discarded because packet too short\n");
+	p2(carps_badauth, "\t\t%llu discarded for bad authentication\n");
+	p2(carps_badvhid, "\t\t%llu discarded for bad vhid\n");
+	p2(carps_badaddrs, "\t\t%llu discarded because of a bad address list\n");
+	p(carps_opackets, "\t%llu packet%s sent (IPv4)\n");
+	p(carps_opackets6, "\t%llu packet%s sent (IPv6)\n");
 #undef p
 #undef p2
 }