BSD 4_4_Lite1 release

[unix-history] / usr / src / usr.bin / netstat / inet.c

diff --git a/usr/src/usr.bin/netstat/inet.c b/usr/src/usr.bin/netstat/inet.c
index d541598..099333e 100644 (file)
--- a/usr/src/usr.bin/netstat/inet.c
+++ b/usr/src/usr.bin/netstat/inet.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1983, 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1983, 1988, 1993
  *     The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)inet.c     8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)inet.c     8.4 (Berkeley) 4/20/94";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -143,6 +169,8 @@ tcp_stats(off, name)
     printf(m, tcpstat.f, plural(tcpstat.f))
 #define        p2(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
     printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2, plural(tcpstat.f2))
     printf(m, tcpstat.f, plural(tcpstat.f))
 #define        p2(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
     printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2, plural(tcpstat.f2))

+#define        p3(f, m) if (tcpstat.f || sflag <= 1) \
+    printf(m, tcpstat.f, plurales(tcpstat.f))

 
        p(tcps_sndtotal, "\t%d packet%s sent\n");
        p2(tcps_sndpack,tcps_sndbyte,
 
        p(tcps_sndtotal, "\t%d packet%s sent\n");
        p2(tcps_sndpack,tcps_sndbyte,


@@ -190,8 +218,12 @@ tcp_stats(off, name)
        p(tcps_keeptimeo, "\t%d keepalive timeout%s\n");
        p(tcps_keepprobe, "\t\t%d keepalive probe%s sent\n");
        p(tcps_keepdrops, "\t\t%d connection%s dropped by keepalive\n");
        p(tcps_keeptimeo, "\t%d keepalive timeout%s\n");
        p(tcps_keepprobe, "\t\t%d keepalive probe%s sent\n");
        p(tcps_keepdrops, "\t\t%d connection%s dropped by keepalive\n");

+       p(tcps_predack, "\t%d correct ACK header prediction%s\n");
+       p(tcps_preddat, "\t%d correct data packet header prediction%s\n");
+       p3(tcps_pcbcachemiss, "\t%d PCB cache miss%s\n");

 #undef p
 #undef p2
 #undef p
 #undef p2

+#undef p3

 }
 
 /*
 }
 
 /*


@@ -229,10 +261,6 @@ udp_stats(off, name)
                printf("\t%u delivered\n", delivered);
        p(udps_opackets, "\t%u datagram%s output\n");
 #undef p
                printf("\t%u delivered\n", delivered);
        p(udps_opackets, "\t%u datagram%s output\n");
 #undef p

-#ifdef sun
-       printf("\t%d socket overflow%s\n",
-               udpstat.udps_fullsock, plural(udpstat.udps_fullsock));
-#endif

 }
 
 /*
 }
 
 /*


@@ -278,7 +306,6 @@ ip_stats(off, name)
        p(ips_ofragments, "\t%u fragment%s created\n");
        p(ips_cantfrag, "\t%u datagram%s that can't be fragmented\n");
 #undef p
        p(ips_ofragments, "\t%u fragment%s created\n");
        p(ips_cantfrag, "\t%u datagram%s that can't be fragmented\n");
 #undef p

-#endif

 }
 
 static char *icmpnames[] = {
 }
 
 static char *icmpnames[] = {