[src/trunk]: src/usr.bin/netstat Pull pfsync_stats() out of inet.c and into p...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ceb0fb07052b
branches:  trunk
changeset: 762819:ceb0fb07052b
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Mar 01 19:01:59 2011 +0000

description:
Pull pfsync_stats() out of inet.c and into pfsync.c so that inet.c does
not have to #include PF header files that pollute the global namespace
by #defining v4 and v6 (sheesh).

diffstat:

 usr.bin/netstat/Makefile |    4 +-
 usr.bin/netstat/inet.c   |   52 +-------------------
 usr.bin/netstat/pfsync.c |  119 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 123 insertions(+), 52 deletions(-)

diffs (221 lines):

diff -r 3156f38b1736 -r ceb0fb07052b usr.bin/netstat/Makefile
--- a/usr.bin/netstat/Makefile  Tue Mar 01 18:53:10 2011 +0000
+++ b/usr.bin/netstat/Makefile  Tue Mar 01 19:01:59 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2010/12/15 11:22:41 pooka Exp $
+#      $NetBSD: Makefile,v 1.33 2011/03/01 19:01:59 dyoung Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -7,7 +7,7 @@
 
 RUMPPRG=netstat
 SRCS=  atalk.c bpf.c fast_ipsec.c if.c inet.c inet6.c ipsec.c iso.c \
-       main.c mbuf.c mroute.c mroute6.c show.c route.c tp_astring.c \
+       main.c mbuf.c mroute.c mroute6.c pfsync.c show.c route.c tp_astring.c \
        unix.c
 .PATH: ${NETBSDSRCDIR}/sys/netiso 
 BINGRP=        kmem
diff -r 3156f38b1736 -r ceb0fb07052b usr.bin/netstat/inet.c
--- a/usr.bin/netstat/inet.c    Tue Mar 01 18:53:10 2011 +0000
+++ b/usr.bin/netstat/inet.c    Tue Mar 01 19:01:59 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: inet.c,v 1.93 2010/12/13 21:15:30 pooka Exp $  */
+/*     $NetBSD: inet.c,v 1.94 2011/03/01 19:01:59 dyoung Exp $ */
 
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "from: @(#)inet.c       8.4 (Berkeley) 4/20/94";
 #else
-__RCSID("$NetBSD: inet.c,v 1.93 2010/12/13 21:15:30 pooka Exp $");
+__RCSID("$NetBSD: inet.c,v 1.94 2011/03/01 19:01:59 dyoung Exp $");
 #endif
 #endif /* not lint */
 
@@ -76,8 +76,6 @@
 #include <netinet/udp.h>
 #include <netinet/ip_carp.h>
 #include <netinet/udp_var.h>
-#include <net/pfvar.h>
-#include <net/if_pfsync.h>
 
 #include <arpa/inet.h>
 #include <kvm.h>
@@ -690,52 +688,6 @@
 }
 
 /*
- * Dump PFSYNC statistics structure.
- */
-void
-pfsync_stats(u_long off, const char *name)
-{
-       uint64_t pfsyncstat[PFSYNC_NSTATS];
-
-       if (use_sysctl) {
-               size_t size = sizeof(pfsyncstat);
-
-               if (sysctlbyname("net.inet.pfsync.stats", pfsyncstat, &size,
-                                NULL, 0) == -1)
-                       return;
-       } else {
-               warnx("%s stats not available via KVM.", name);
-               return;
-       }
-
-       printf("%s:\n", name);
-
-#define p(f, m) if (pfsyncstat[f] || sflag <= 1) \
-       printf(m, pfsyncstat[f], plural(pfsyncstat[f]))
-#define p2(f, m) if (pfsyncstat[f] || sflag <= 1) \
-       printf(m, pfsyncstat[f])
-
-       p(PFSYNC_STAT_IPACKETS, "\t%" PRIu64 " packet%s received (IPv4)\n");
-       p(PFSYNC_STAT_IPACKETS6,"\t%" PRIu64 " packet%s received (IPv6)\n");
-       p(PFSYNC_STAT_BADIF, "\t\t%" PRIu64 " packet%s discarded for bad interface\n");
-       p(PFSYNC_STAT_BADTTL, "\t\t%" PRIu64 " packet%s discarded for bad ttl\n");
-       p(PFSYNC_STAT_HDROPS, "\t\t%" PRIu64 " packet%s shorter than header\n");
-       p(PFSYNC_STAT_BADVER, "\t\t%" PRIu64 " packet%s discarded for bad version\n");
-       p(PFSYNC_STAT_BADAUTH, "\t\t%" PRIu64 " packet%s discarded for bad HMAC\n");
-       p(PFSYNC_STAT_BADACT,"\t\t%" PRIu64 " packet%s discarded for bad action\n");
-       p(PFSYNC_STAT_BADLEN, "\t\t%" PRIu64 " packet%s discarded for short packet\n");
-       p(PFSYNC_STAT_BADVAL, "\t\t%" PRIu64 " state%s discarded for bad values\n");
-       p(PFSYNC_STAT_STALE, "\t\t%" PRIu64 " stale state%s\n");
-       p(PFSYNC_STAT_BADSTATE, "\t\t%" PRIu64 " failed state lookup/insert%s\n");
-       p(PFSYNC_STAT_OPACKETS, "\t%" PRIu64 " packet%s sent (IPv4)\n");
-       p(PFSYNC_STAT_OPACKETS6, "\t%" PRIu64 " packet%s sent (IPv6)\n");
-       p2(PFSYNC_STAT_ONOMEM, "\t\t%" PRIu64 " send failed due to mbuf memory error\n");
-       p2(PFSYNC_STAT_OERRORS, "\t\t%" PRIu64 " send error\n");
-#undef p
-#undef p2
-}
-
-/*
  * Dump PIM statistics structure.
  */
 void
diff -r 3156f38b1736 -r ceb0fb07052b usr.bin/netstat/pfsync.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/netstat/pfsync.c  Tue Mar 01 19:01:59 2011 +0000
@@ -0,0 +1,119 @@
+/*     $NetBSD: pfsync.c,v 1.1 2011/03/01 19:01:59 dyoung Exp $        */
+
+/*
+ * Copyright (c) 1983, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#ifndef lint
+__RCSID("$NetBSD: pfsync.c,v 1.1 2011/03/01 19:01:59 dyoung Exp $");
+#endif /* not lint */
+
+#define        _CALLOUT_PRIVATE        /* for defs in sys/callout.h */
+
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/mbuf.h>
+#include <sys/protosw.h>
+#include <sys/sysctl.h>
+
+#include <net/if_arp.h>
+#include <net/route.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip_icmp.h>
+
+#ifdef INET6
+#include <netinet/ip6.h>
+#endif
+
+#include <net/pfvar.h>
+#include <net/if_pfsync.h>
+
+#include <arpa/inet.h>
+#include <kvm.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <err.h>
+#include "netstat.h"
+#include "prog_ops.h"
+
+/*
+ * Dump PFSYNC statistics structure.
+ */
+void
+pfsync_stats(u_long off, const char *name)
+{
+       uint64_t pfsyncstat[PFSYNC_NSTATS];
+
+       if (use_sysctl) {
+               size_t size = sizeof(pfsyncstat);
+
+               if (sysctlbyname("net.inet.pfsync.stats", pfsyncstat, &size,
+                                NULL, 0) == -1)
+                       return;
+       } else {
+               warnx("%s stats not available via KVM.", name);
+               return;
+       }
+
+       printf("%s:\n", name);
+
+#define p(f, m) if (pfsyncstat[f] || sflag <= 1) \
+       printf(m, pfsyncstat[f], plural(pfsyncstat[f]))
+#define p2(f, m) if (pfsyncstat[f] || sflag <= 1) \
+       printf(m, pfsyncstat[f])
+
+       p(PFSYNC_STAT_IPACKETS, "\t%" PRIu64 " packet%s received (IPv4)\n");
+       p(PFSYNC_STAT_IPACKETS6,"\t%" PRIu64 " packet%s received (IPv6)\n");
+       p(PFSYNC_STAT_BADIF, "\t\t%" PRIu64 " packet%s discarded for bad interface\n");
+       p(PFSYNC_STAT_BADTTL, "\t\t%" PRIu64 " packet%s discarded for bad ttl\n");
+       p(PFSYNC_STAT_HDROPS, "\t\t%" PRIu64 " packet%s shorter than header\n");
+       p(PFSYNC_STAT_BADVER, "\t\t%" PRIu64 " packet%s discarded for bad version\n");
+       p(PFSYNC_STAT_BADAUTH, "\t\t%" PRIu64 " packet%s discarded for bad HMAC\n");
+       p(PFSYNC_STAT_BADACT,"\t\t%" PRIu64 " packet%s discarded for bad action\n");
+       p(PFSYNC_STAT_BADLEN, "\t\t%" PRIu64 " packet%s discarded for short packet\n");
+       p(PFSYNC_STAT_BADVAL, "\t\t%" PRIu64 " state%s discarded for bad values\n");
+       p(PFSYNC_STAT_STALE, "\t\t%" PRIu64 " stale state%s\n");
+       p(PFSYNC_STAT_BADSTATE, "\t\t%" PRIu64 " failed state lookup/insert%s\n");
+       p(PFSYNC_STAT_OPACKETS, "\t%" PRIu64 " packet%s sent (IPv4)\n");
+       p(PFSYNC_STAT_OPACKETS6, "\t%" PRIu64 " packet%s sent (IPv6)\n");
+       p2(PFSYNC_STAT_ONOMEM, "\t\t%" PRIu64 " send failed due to mbuf memory error\n");
+       p2(PFSYNC_STAT_OERRORS, "\t\t%" PRIu64 " send error\n");
+#undef p
+#undef p2
+}
+
+