]> git.saurik.com Git - apple/network_cmds.git/blobdiff - netstat.tproj/inet.c
network_cmds-433.tar.gz
[apple/network_cmds.git] / netstat.tproj / inet.c
index 8644d53e59dec461eb4fb4a0a08f48c97da30519..fe69a5495da9be83575f4c39d776bcaf34e5a268 100644 (file)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2008-2012 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ ** @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
 /*
  * Copyright (c) 1983, 1988, 1993, 1995
  *     The Regents of the University of California.  All rights reserved.
@@ -36,7 +62,7 @@
 static char sccsid[] = "@(#)inet.c     8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-       "$Id: inet.c,v 1.7 2004/08/26 23:55:22 lindak Exp $";
+       "$Id: inet.c,v 1.9 2006/04/04 04:36:27 lindak Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -46,6 +72,7 @@ static const char rcsid[] =
 #include <sys/sysctl.h>
 
 #include <net/route.h>
+#include <net/if_arp.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -77,11 +104,20 @@ static const char rcsid[] =
 #include <unistd.h>
 #include "netstat.h"
 
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#endif
+
+#define ROUNDUP64(a) \
+       ((a) > 0 ? (1 + (((a) - 1) | (sizeof(uint64_t) - 1))) : sizeof(uint64_t))
+#define ADVANCE64(x, n) (((char *)x) += ROUNDUP64(n))
+
 char   *inetname (struct in_addr *);
 void   inetprint (struct in_addr *, int, char *, int);
 #ifdef INET6
 extern void    inet6print (struct in6_addr *, int, char *, int);
 static int udp_done, tcp_done;
+extern int mptcp_done;
 #endif /* INET6 */
 
 #ifdef SRVCACHE
@@ -103,7 +139,7 @@ static void
 _serv_cache_open()
 {
        struct servent *s;
-       char *key, *name;
+       char *key, *name, *test;
 
        if (_serv_cache != NULL) return;
 
@@ -116,8 +152,8 @@ _serv_cache_open()
                key = NULL;
                asprintf(&key, "%hu/%s", (unsigned short)ntohs(s->s_port), s->s_proto);
                name = strdup(s->s_name);
-               name = _nc_table_find(_serv_cache, key);
-               if (name == NULL) _nc_table_insert(_serv_cache, key, name);
+               test = _nc_table_find(_serv_cache, key);
+               if (test == NULL) _nc_table_insert(_serv_cache, key, name);
                free(key);
        }
 
@@ -153,7 +189,7 @@ _serv_cache_getservbyport(int port, char *proto)
        return &s;
 }
 
-#endif SRVCACHE
+#endif /* SRVCACHE */
        
 /*
  * Print a summary of connections related to an Internet
@@ -161,47 +197,61 @@ _serv_cache_getservbyport(int port, char *proto)
  * Listening processes (aflag) are suppressed unless the
  * -a (all) flag is specified.
  */
+
+struct xgen_n {
+       u_int32_t       xgn_len;                        /* length of this structure */
+       u_int32_t       xgn_kind;               /* number of PCBs at this time */
+};
+
+#define ALL_XGN_KIND_INP (XSO_SOCKET | XSO_RCVBUF | XSO_SNDBUF | XSO_STATS | XSO_INPCB)
+#define ALL_XGN_KIND_TCP (ALL_XGN_KIND_INP | XSO_TCPCB)
+
 void
-protopr(u_long proto,          /* for sysctl version we pass proto # */
-       char *name, int af)
+protopr(uint32_t proto,                /* for sysctl version we pass proto # */
+               char *name, int af)
 {
        int istcp;
        static int first = 1;
-       char *buf;
+       char *buf, *next;
        const char *mibvar;
-       struct tcpcb *tp = NULL;
-       struct inpcb *inp;
        struct xinpgen *xig, *oxig;
-       struct xsocket *so;
+       struct xgen_n *xgn;
        size_t len;
+       struct xtcpcb_n *tp = NULL;
+       struct xinpcb_n *inp = NULL;
+       struct xsocket_n *so = NULL;
+       struct xsockbuf_n *so_rcv = NULL;
+       struct xsockbuf_n *so_snd = NULL;
+       struct xsockstat_n *so_stat = NULL;
+       int which = 0;
 
        istcp = 0;
        switch (proto) {
-       case IPPROTO_TCP:
+               case IPPROTO_TCP:
 #ifdef INET6
-               if (tcp_done != 0)
-                       return;
-               else
-                       tcp_done = 1;
+                       if (tcp_done != 0)
+                               return;
+                       else
+                               tcp_done = 1;
 #endif
-               istcp = 1;
-               mibvar = "net.inet.tcp.pcblist";
-               break;
-       case IPPROTO_UDP:
+                       istcp = 1;
+                       mibvar = "net.inet.tcp.pcblist_n";
+                       break;
+               case IPPROTO_UDP:
 #ifdef INET6
-               if (udp_done != 0)
-                       return;
-               else
-                       udp_done = 1;
+                       if (udp_done != 0)
+                               return;
+                       else
+                               udp_done = 1;
 #endif
-               mibvar = "net.inet.udp.pcblist";
-               break;
-       case IPPROTO_DIVERT:
-               mibvar = "net.inet.divert.pcblist";
-               break;
-       default:
-               mibvar = "net.inet.raw.pcblist";
-               break;
+                       mibvar = "net.inet.udp.pcblist_n";
+                       break;
+               case IPPROTO_DIVERT:
+                       mibvar = "net.inet.divert.pcblist_n";
+                       break;
+               default:
+                       mibvar = "net.inet.raw.pcblist_n";
+                       break;
        }
        len = 0;
        if (sysctlbyname(mibvar, 0, &len, 0, 0) < 0) {
@@ -218,200 +268,249 @@ protopr(u_long proto,           /* for sysctl version we pass proto # */
                free(buf);
                return;
        }
-        
-        /*
-         * Bail-out to avoid logic error in the loop below when
-         * there is in fact no more control block to process
-         */
-        if (len <= sizeof(struct xinpgen)) {
-            free(buf);
-            return;
-        }
-            
+       
+       /*
+        * Bail-out to avoid logic error in the loop below when
+        * there is in fact no more control block to process
+        */
+       if (len <= sizeof(struct xinpgen)) {
+               free(buf);
+               return;
+       }
+       
        oxig = xig = (struct xinpgen *)buf;
-       for (xig = (struct xinpgen *)((char *)xig + xig->xig_len);
-            xig->xig_len > sizeof(struct xinpgen);
-            xig = (struct xinpgen *)((char *)xig + xig->xig_len)) {
-               if (istcp) {
-                       tp = &((struct xtcpcb *)xig)->xt_tp;
-                       inp = &((struct xtcpcb *)xig)->xt_inp;
-                       so = &((struct xtcpcb *)xig)->xt_socket;
+       for (next = buf + ROUNDUP64(xig->xig_len); next < buf + len; next += ROUNDUP64(xgn->xgn_len)) {
+               
+               xgn = (struct xgen_n*)next;
+               if (xgn->xgn_len <= sizeof(struct xinpgen))
+                       break;
+               
+               if ((which & xgn->xgn_kind) == 0) {
+                       which |= xgn->xgn_kind;
+                       switch (xgn->xgn_kind) {
+                               case XSO_SOCKET:
+                                       so = (struct xsocket_n *)xgn;
+                                       break;
+                               case XSO_RCVBUF:
+                                       so_rcv = (struct xsockbuf_n *)xgn;
+                                       break;
+                               case XSO_SNDBUF:
+                                       so_snd = (struct xsockbuf_n *)xgn;
+                                       break;
+                               case XSO_STATS:
+                                       so_stat = (struct xsockstat_n *)xgn;
+                                       break;
+                               case XSO_INPCB:
+                                       inp = (struct xinpcb_n *)xgn;
+                                       break;
+                               case XSO_TCPCB:
+                                       tp = (struct xtcpcb_n *)xgn;
+                                       break;
+                               default:
+                                       printf("unexpected kind %d\n", xgn->xgn_kind);
+                                       break;
+                       }               
                } else {
-                       inp = &((struct xinpcb *)xig)->xi_inp;
-                       so = &((struct xinpcb *)xig)->xi_socket;
+            if (vflag)
+                printf("got %d twice\n", xgn->xgn_kind);
                }
-
+               
+               if ((istcp && which != ALL_XGN_KIND_TCP) || (!istcp && which != ALL_XGN_KIND_INP))
+                       continue;
+               which = 0;
+               
                /* Ignore sockets for protocols other than the desired one. */
                if (so->xso_protocol != (int)proto)
                        continue;
-
+               
                /* Ignore PCBs which were freed during copyout. */
                if (inp->inp_gencnt > oxig->xig_gen)
                        continue;
-
+               
                if ((af == AF_INET && (inp->inp_vflag & INP_IPV4) == 0)
 #ifdef INET6
                    || (af == AF_INET6 && (inp->inp_vflag & INP_IPV6) == 0)
 #endif /* INET6 */
                    || (af == AF_UNSPEC && ((inp->inp_vflag & INP_IPV4) == 0
 #ifdef INET6
-                                           && (inp->inp_vflag &
-                                               INP_IPV6) == 0
+                                                                       && (inp->inp_vflag &
+                                                                               INP_IPV6) == 0
 #endif /* INET6 */
-                       ))
+                                                                       ))
                    )
                        continue;
-#ifdef __APPLE__
-                /*
-                 * Local address is not an indication of listening socket or
-                 * server sockey but just rather the socket has been bound.
-                 * That why many UDP sockets were not displayed in the original code.
-                 */
-                if (!aflag && istcp && tp->t_state <= TCPS_LISTEN)
-                    continue;
-#else
-                if (!aflag && 
-                   (
-                    (af == AF_INET &&
-                     inet_lnaof(inp->inp_laddr) == INADDR_ANY)
-#ifdef INET6
-                    || (af == AF_INET6 &&
-                        IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
-#endif /* INET6 */
-                    || (af == AF_UNSPEC &&
-                        (((inp->inp_vflag & INP_IPV4) != 0 &&
-                          inet_lnaof(inp->inp_laddr) == INADDR_ANY)
-#ifdef INET6
-                         || ((inp->inp_vflag & INP_IPV6) != 0 &&
-                             IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr))
-#endif
-                         ))
-                    ))
-                    continue;
-#endif
-
-                if (Lflag && !so->so_qlimit)
-                    continue;
-
-                if (first) {
+               
+               /*
+                * Local address is not an indication of listening socket or
+                * server sockey but just rather the socket has been bound.
+                * That why many UDP sockets were not displayed in the original code.
+                */
+               if (!aflag && istcp && tp->t_state <= TCPS_LISTEN)
+                       continue;
+               
+               if (Lflag && !so->so_qlimit)
+                       continue;
+               
+               if (first) {
                        if (!Lflag) {
                                printf("Active Internet connections");
                                if (aflag)
                                        printf(" (including servers)");
                        } else
                                printf(
-       "Current listen queue sizes (qlen/incqlen/maxqlen)");
+                                          "Current listen queue sizes (qlen/incqlen/maxqlen)");
                        putchar('\n');
-                       if (Aflag)
+                       if (Aflag) {
+#if !TARGET_OS_EMBEDDED
+                               printf("%-16.16s ", "Socket");
+#else
                                printf("%-8.8s ", "Socket");
+#endif
+                               printf("%-9.9s", "Flowhash");
+                       }
                        if (Lflag)
                                printf("%-14.14s %-22.22s\n",
-                                       "Listen", "Local Address");
-                       else
+                                          "Listen", "Local Address");
+                       else {
                                printf((Aflag && !Wflag) ?
-               "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
-               "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
-                                       "Proto", "Recv-Q", "Send-Q",
-                                       "Local Address", "Foreign Address",
-                                       "(state)");
+                                          "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %-11.11s" :
+                                          "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %-11.11s",
+                                          "Proto", "Recv-Q", "Send-Q",
+                                          "Local Address", "Foreign Address",
+                                          "(state)");
+                               if (bflag > 0)
+                                       printf(" %10.10s %10.10s", "rxbytes", "txbytes");
+                               if (prioflag >= 0)
+                                       printf(" %7.7s[%1d] %7.7s[%1d]", "rxbytes", prioflag, "txbytes", prioflag);
+                               printf("\n");
+                       }
                        first = 0;
                }
-                if (Aflag) {
-                        if (istcp)
-                                printf("%8lx ", (u_long)inp->inp_ppcb);
-                        else
-                                printf("%8lx ", (u_long)so->so_pcb);
-                }
+               if (Aflag) {
+                       if (istcp)
+#if !TARGET_OS_EMBEDDED
+                               printf("%16lx ", (u_long)inp->inp_ppcb);
+#else
+                       printf("%8lx ", (u_long)inp->inp_ppcb);
+                       
+#endif
+                       else
+#if !TARGET_OS_EMBEDDED
+                               printf("%16lx ", (u_long)so->so_pcb);
+#else
+                       printf("%8lx ", (u_long)so->so_pcb);
+#endif
+                       printf("%8x ", inp->inp_flowhash);
+               }
                if (Lflag) {
-                               char buf[15];
-
-                               snprintf(buf, 15, "%d/%d/%d", so->so_qlen,
+                       char buf[15];
+                       
+                       snprintf(buf, 15, "%d/%d/%d", so->so_qlen,
                                         so->so_incqlen, so->so_qlimit);
-                               printf("%-14.14s ", buf);
-                }
+                       printf("%-14.14s ", buf);
+               }
                else {
                        const char *vchar;
-
+                       
 #ifdef INET6
                        if ((inp->inp_vflag & INP_IPV6) != 0)
                                vchar = ((inp->inp_vflag & INP_IPV4) != 0)
-                                       ? "46" : "6 ";
+                               ? "46" : "6 ";
                        else
 #endif
-                       vchar = ((inp->inp_vflag & INP_IPV4) != 0)
-                                       ? "4 " : "  ";
-
-                       printf("%-3.3s%-2.2s %6ld %6ld  ", name, vchar,
-                              so->so_rcv.sb_cc,
-                              so->so_snd.sb_cc);
+                               vchar = ((inp->inp_vflag & INP_IPV4) != 0)
+                               ? "4 " : "  ";
+                       
+                       printf("%-3.3s%-2.2s %6u %6u  ", name, vchar,
+                              so_rcv->sb_cc,
+                              so_snd->sb_cc);
                }
                if (nflag) {
                        if (inp->inp_vflag & INP_IPV4) {
                                inetprint(&inp->inp_laddr, (int)inp->inp_lport,
-                                         name, 1);
+                                                 name, 1);
                                if (!Lflag)
                                        inetprint(&inp->inp_faddr,
-                                                 (int)inp->inp_fport, name, 1);
+                                                         (int)inp->inp_fport, name, 1);
                        }
 #ifdef INET6
                        else if (inp->inp_vflag & INP_IPV6) {
                                inet6print(&inp->in6p_laddr,
-                                          (int)inp->inp_lport, name, 1);
+                                                  (int)inp->inp_lport, name, 1);
                                if (!Lflag)
                                        inet6print(&inp->in6p_faddr,
-                                                  (int)inp->inp_fport, name, 1);
+                                                          (int)inp->inp_fport, name, 1);
                        } /* else nothing printed now */
 #endif /* INET6 */
                } else if (inp->inp_flags & INP_ANONPORT) {
                        if (inp->inp_vflag & INP_IPV4) {
                                inetprint(&inp->inp_laddr, (int)inp->inp_lport,
-                                         name, 1);
+                                                 name, 1);
                                if (!Lflag)
                                        inetprint(&inp->inp_faddr,
-                                                 (int)inp->inp_fport, name, 0);
+                                                         (int)inp->inp_fport, name, 0);
                        }
 #ifdef INET6
                        else if (inp->inp_vflag & INP_IPV6) {
                                inet6print(&inp->in6p_laddr,
-                                          (int)inp->inp_lport, name, 1);
+                                                  (int)inp->inp_lport, name, 1);
                                if (!Lflag)
                                        inet6print(&inp->in6p_faddr,
-                                                  (int)inp->inp_fport, name, 0);
+                                                          (int)inp->inp_fport, name, 0);
                        } /* else nothing printed now */
 #endif /* INET6 */
                } else {
                        if (inp->inp_vflag & INP_IPV4) {
                                inetprint(&inp->inp_laddr, (int)inp->inp_lport,
-                                         name, 0);
+                                                 name, 0);
                                if (!Lflag)
                                        inetprint(&inp->inp_faddr,
-                                                 (int)inp->inp_fport, name,
-                                                 inp->inp_lport !=
-                                                       inp->inp_fport);
+                                                         (int)inp->inp_fport, name,
+                                                         inp->inp_lport !=
+                                                         inp->inp_fport);
                        }
 #ifdef INET6
                        else if (inp->inp_vflag & INP_IPV6) {
                                inet6print(&inp->in6p_laddr,
-                                          (int)inp->inp_lport, name, 0);
+                                                  (int)inp->inp_lport, name, 0);
                                if (!Lflag)
                                        inet6print(&inp->in6p_faddr,
-                                                  (int)inp->inp_fport, name,
-                                                  inp->inp_lport !=
-                                                       inp->inp_fport);
+                                                          (int)inp->inp_fport, name,
+                                                          inp->inp_lport !=
+                                                          inp->inp_fport);
                        } /* else nothing printed now */
 #endif /* INET6 */
                }
                if (istcp && !Lflag) {
                        if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES)
-                               printf("%d", tp->t_state);
-                      else {
-                               printf("%s", tcpstates[tp->t_state]);
+                               printf("%-11d", tp->t_state);
+                       else {
+                               printf("%-11s", tcpstates[tp->t_state]);
 #if defined(TF_NEEDSYN) && defined(TF_NEEDFIN)
-                              /* Show T/TCP `hidden state' */
-                              if (tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN))
-                                      putchar('*');
+                               /* Show T/TCP `hidden state' */
+                               if (tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN))
+                                       putchar('*');
 #endif /* defined(TF_NEEDSYN) && defined(TF_NEEDFIN) */
-                      }
+                       }
+               }
+               if (!istcp)
+                       printf("%-11s", "           ");
+               if (bflag > 0) {
+                       int i;
+                       u_int64_t rxbytes = 0;
+                       u_int64_t txbytes = 0;
+                       
+                       for (i = 0; i < SO_TC_STATS_MAX; i++) {
+                               rxbytes += so_stat->xst_tc_stats[i].rxbytes;
+                               txbytes += so_stat->xst_tc_stats[i].txbytes;
+                       }
+                       
+                       printf(" %10llu %10llu", rxbytes, txbytes);
+               }
+               if (prioflag >= 0) {
+                       printf(" %10llu %10llu", 
+                                  prioflag < SO_TC_STATS_MAX ? so_stat->xst_tc_stats[prioflag].rxbytes : 0, 
+                                  prioflag < SO_TC_STATS_MAX ? so_stat->xst_tc_stats[prioflag].txbytes : 0);
                }
                putchar('\n');
        }
@@ -434,103 +533,152 @@ protopr(u_long proto,           /* for sysctl version we pass proto # */
  * Dump TCP statistics structure.
  */
 void
-tcp_stats(u_long off , char *name, int af )
+tcp_stats(uint32_t off , char *name, int af)
 {
+       static struct tcpstat ptcpstat;
        struct tcpstat tcpstat;
        size_t len = sizeof tcpstat;
-       
+       static uint32_t r_swcsum, pr_swcsum;
+       static uint32_t t_swcsum, pt_swcsum;
+
        if (sysctlbyname("net.inet.tcp.stats", &tcpstat, &len, 0, 0) < 0) {
                warn("sysctl: net.inet.tcp.stats");
                return;
        }
 
 #ifdef INET6
-       if (tcp_done != 0)
+       if (tcp_done != 0 && interval == 0)
                return;
        else
                tcp_done = 1;
 #endif
 
+    if (interval && vflag > 0)
+        print_time();
        printf ("%s:\n", name);
 
-#define        p(f, m) if (tcpstat.f || sflag <= 1) \
-    printf(m, tcpstat.f, plural(tcpstat.f))
-#define        p1a(f, m) if (tcpstat.f || sflag <= 1) \
-    printf(m, 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        p2a(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
-    printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2)
-#define        p3(f, m) if (tcpstat.f || sflag <= 1) \
-    printf(m, tcpstat.f, plurales(tcpstat.f))
-
-       p(tcps_sndtotal, "\t%lu packet%s sent\n");
+#define        TCPDIFF(f) (tcpstat.f - ptcpstat.f)
+#define        p(f, m) if (TCPDIFF(f) || sflag <= 1) \
+    printf(m, TCPDIFF(f), plural(TCPDIFF(f)))
+#define        p1a(f, m) if (TCPDIFF(f) || sflag <= 1) \
+    printf(m, TCPDIFF(f))
+#define        p2(f1, f2, m) if (TCPDIFF(f1) || TCPDIFF(f2) || sflag <= 1) \
+    printf(m, TCPDIFF(f1), plural(TCPDIFF(f1)), TCPDIFF(f2), plural(TCPDIFF(f2)))
+#define        p2a(f1, f2, m) if (TCPDIFF(f1) || TCPDIFF(f2) || sflag <= 1) \
+    printf(m, TCPDIFF(f1), plural(TCPDIFF(f1)), TCPDIFF(f2))
+#define        p3(f, m) if (TCPDIFF(f) || sflag <= 1) \
+    printf(m, TCPDIFF(f), plurales(TCPDIFF(f)))
+
+       p(tcps_sndtotal, "\t%u packet%s sent\n");
        p2(tcps_sndpack,tcps_sndbyte,
-               "\t\t%lu data packet%s (%lu byte%s)\n");
+               "\t\t%u data packet%s (%u byte%s)\n");
        p2(tcps_sndrexmitpack, tcps_sndrexmitbyte,
-               "\t\t%lu data packet%s (%lu byte%s) retransmitted\n");
-       p(tcps_mturesent, "\t\t%lu resend%s initiated by MTU discovery\n");
+               "\t\t%u data packet%s (%u byte%s) retransmitted\n");
+       p(tcps_mturesent, "\t\t%u resend%s initiated by MTU discovery\n");
        p2a(tcps_sndacks, tcps_delack,
-               "\t\t%lu ack-only packet%s (%lu delayed)\n");
-       p(tcps_sndurg, "\t\t%lu URG only packet%s\n");
-       p(tcps_sndprobe, "\t\t%lu window probe packet%s\n");
-       p(tcps_sndwinup, "\t\t%lu window update packet%s\n");
-       p(tcps_sndctrl, "\t\t%lu control packet%s\n");
-       p(tcps_rcvtotal, "\t%lu packet%s received\n");
-       p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%lu ack%s (for %lu byte%s)\n");
-       p(tcps_rcvdupack, "\t\t%lu duplicate ack%s\n");
-       p(tcps_rcvacktoomuch, "\t\t%lu ack%s for unsent data\n");
+               "\t\t%u ack-only packet%s (%u delayed)\n");
+       p(tcps_sndurg, "\t\t%u URG only packet%s\n");
+       p(tcps_sndprobe, "\t\t%u window probe packet%s\n");
+       p(tcps_sndwinup, "\t\t%u window update packet%s\n");
+       p(tcps_sndctrl, "\t\t%u control packet%s\n");
+       p(tcps_fcholdpacket, "\t\t%u data packet%s sent after flow control\n");
+       t_swcsum = tcpstat.tcps_snd_swcsum + tcpstat.tcps_snd6_swcsum;
+       if ((t_swcsum - pt_swcsum) || sflag <= 1)
+        printf("\t\t%u checksummed in software\n", (t_swcsum - pt_swcsum));
+       p2(tcps_snd_swcsum, tcps_snd_swcsum_bytes,
+           "\t\t\t%u segment%s (%u byte%s) over IPv4\n");
+#if INET6
+       p2(tcps_snd6_swcsum, tcps_snd6_swcsum_bytes,
+           "\t\t\t%u segment%s (%u byte%s) over IPv6\n");
+#endif /* INET6 */
+       p(tcps_rcvtotal, "\t%u packet%s received\n");
+       p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%u ack%s (for %u byte%s)\n");
+       p(tcps_rcvdupack, "\t\t%u duplicate ack%s\n");
+       p(tcps_rcvacktoomuch, "\t\t%u ack%s for unsent data\n");
        p2(tcps_rcvpack, tcps_rcvbyte,
-               "\t\t%lu packet%s (%lu byte%s) received in-sequence\n");
+               "\t\t%u packet%s (%u byte%s) received in-sequence\n");
        p2(tcps_rcvduppack, tcps_rcvdupbyte,
-               "\t\t%lu completely duplicate packet%s (%lu byte%s)\n");
-       p(tcps_pawsdrop, "\t\t%lu old duplicate packet%s\n");
+               "\t\t%u completely duplicate packet%s (%u byte%s)\n");
+       p(tcps_pawsdrop, "\t\t%u old duplicate packet%s\n");
        p2(tcps_rcvpartduppack, tcps_rcvpartdupbyte,
-               "\t\t%lu packet%s with some dup. data (%lu byte%s duped)\n");
+               "\t\t%u packet%s with some dup. data (%u byte%s duped)\n");
        p2(tcps_rcvoopack, tcps_rcvoobyte,
-               "\t\t%lu out-of-order packet%s (%lu byte%s)\n");
+               "\t\t%u out-of-order packet%s (%u byte%s)\n");
        p2(tcps_rcvpackafterwin, tcps_rcvbyteafterwin,
-               "\t\t%lu packet%s (%lu byte%s) of data after window\n");
-       p(tcps_rcvwinprobe, "\t\t%lu window probe%s\n");
-       p(tcps_rcvwinupd, "\t\t%lu window update packet%s\n");
-       p(tcps_rcvafterclose, "\t\t%lu packet%s received after close\n");
-       p(tcps_rcvbadsum, "\t\t%lu discarded for bad checksum%s\n");
-       p(tcps_rcvbadoff, "\t\t%lu discarded for bad header offset field%s\n");
-       p1a(tcps_rcvshort, "\t\t%lu discarded because packet too short\n");
-       p(tcps_connattempt, "\t%lu connection request%s\n");
-       p(tcps_accepts, "\t%lu connection accept%s\n");
-       p(tcps_badsyn, "\t%lu bad connection attempt%s\n");
-       p(tcps_listendrop, "\t%lu listen queue overflow%s\n");
-       p(tcps_connects, "\t%lu connection%s established (including accepts)\n");
+               "\t\t%u packet%s (%u byte%s) of data after window\n");
+       p(tcps_rcvwinprobe, "\t\t%u window probe%s\n");
+       p(tcps_rcvwinupd, "\t\t%u window update packet%s\n");
+       p(tcps_rcvafterclose, "\t\t%u packet%s received after close\n");
+       p(tcps_badrst, "\t\t%u bad reset%s\n");
+       p(tcps_rcvbadsum, "\t\t%u discarded for bad checksum%s\n");
+       r_swcsum = tcpstat.tcps_rcv_swcsum + tcpstat.tcps_rcv6_swcsum;
+       if ((r_swcsum - pr_swcsum) || sflag <= 1)
+        printf("\t\t%u checksummed in software\n",
+               (r_swcsum - pr_swcsum));
+       p2(tcps_rcv_swcsum, tcps_rcv_swcsum_bytes,
+           "\t\t\t%u segment%s (%u byte%s) over IPv4\n");
+#if INET6
+       p2(tcps_rcv6_swcsum, tcps_rcv6_swcsum_bytes,
+           "\t\t\t%u segment%s (%u byte%s) over IPv6\n");
+#endif /* INET6 */
+       p(tcps_rcvbadoff, "\t\t%u discarded for bad header offset field%s\n");
+       p1a(tcps_rcvshort, "\t\t%u discarded because packet too short\n");
+       p(tcps_connattempt, "\t%u connection request%s\n");
+       p(tcps_accepts, "\t%u connection accept%s\n");
+       p(tcps_badsyn, "\t%u bad connection attempt%s\n");
+       p(tcps_listendrop, "\t%u listen queue overflow%s\n");
+       p(tcps_connects, "\t%u connection%s established (including accepts)\n");
        p2(tcps_closed, tcps_drops,
-               "\t%lu connection%s closed (including %lu drop%s)\n");
-       p(tcps_cachedrtt, "\t\t%lu connection%s updated cached RTT on close\n");
+               "\t%u connection%s closed (including %u drop%s)\n");
+       p(tcps_cachedrtt, "\t\t%u connection%s updated cached RTT on close\n");
        p(tcps_cachedrttvar, 
-         "\t\t%lu connection%s updated cached RTT variance on close\n");
+         "\t\t%u connection%s updated cached RTT variance on close\n");
        p(tcps_cachedssthresh,
-         "\t\t%lu connection%s updated cached ssthresh on close\n");
-       p(tcps_conndrops, "\t%lu embryonic connection%s dropped\n");
+         "\t\t%u connection%s updated cached ssthresh on close\n");
+       p(tcps_conndrops, "\t%u embryonic connection%s dropped\n");
        p2(tcps_rttupdated, tcps_segstimed,
-               "\t%lu segment%s updated rtt (of %lu attempt%s)\n");
-       p(tcps_rexmttimeo, "\t%lu retransmit timeout%s\n");
-       p(tcps_timeoutdrop, "\t\t%lu connection%s dropped by rexmit timeout\n");
-       p(tcps_persisttimeo, "\t%lu persist timeout%s\n");
-       p(tcps_persistdrop, "\t\t%lu connection%s dropped by persist timeout\n");
-       p(tcps_keeptimeo, "\t%lu keepalive timeout%s\n");
-       p(tcps_keepprobe, "\t\t%lu keepalive probe%s sent\n");
-       p(tcps_keepdrops, "\t\t%lu connection%s dropped by keepalive\n");
-       p(tcps_predack, "\t%lu correct ACK header prediction%s\n");
-       p(tcps_preddat, "\t%lu correct data packet header prediction%s\n");
-       p(tcps_sack_recovery_episode, "\t%lu SACK recovery episode%s\n"); 
+               "\t%u segment%s updated rtt (of %u attempt%s)\n");
+       p(tcps_rexmttimeo, "\t%u retransmit timeout%s\n");
+       p(tcps_timeoutdrop, "\t\t%u connection%s dropped by rexmit timeout\n");
+       p(tcps_rxtfindrop, "\t\t%u connection%s dropped after retransmitting FIN\n");
+       p(tcps_persisttimeo, "\t%u persist timeout%s\n");
+       p(tcps_persistdrop, "\t\t%u connection%s dropped by persist timeout\n");
+       p(tcps_keeptimeo, "\t%u keepalive timeout%s\n");
+       p(tcps_keepprobe, "\t\t%u keepalive probe%s sent\n");
+       p(tcps_keepdrops, "\t\t%u connection%s dropped by keepalive\n");
+       p(tcps_predack, "\t%u correct ACK header prediction%s\n");
+       p(tcps_preddat, "\t%u correct data packet header prediction%s\n");
+#ifdef TCP_MAX_SACK
+       /* TCP_MAX_SACK indicates the header has the SACK structures */
+       p(tcps_sack_recovery_episode, "\t%u SACK recovery episode%s\n"); 
        p(tcps_sack_rexmits,
-               "\t%lu segment rexmit%s in SACK recovery episodes\n");
+               "\t%u segment rexmit%s in SACK recovery episodes\n");
        p(tcps_sack_rexmit_bytes,
-               "\t%lu byte rexmit%s in SACK recovery episodes\n"); 
+               "\t%u byte rexmit%s in SACK recovery episodes\n"); 
        p(tcps_sack_rcv_blocks,
-               "\t%lu SACK option%s (SACK blocks) received\n"); 
-       p(tcps_sack_send_blocks, "\t%lu SACK option%s (SACK blocks) sent\n"); 
-       p1a(tcps_sack_sboverflow, "\t%lu SACK scoreboard overflow\n"); 
+               "\t%u SACK option%s (SACK blocks) received\n"); 
+       p(tcps_sack_send_blocks, "\t%u SACK option%s (SACK blocks) sent\n"); 
+       p1a(tcps_sack_sboverflow, "\t%u SACK scoreboard overflow\n"); 
+#endif /* TCP_MAX_SACK */
+
+       p(tcps_coalesced_pack, "\t%u LRO coalesced packet%s\n");
+       p(tcps_flowtbl_full, "\t\t%u time%s LRO flow table was full\n");
+       p(tcps_flowtbl_collision, "\t\t%u collision%s in LRO flow table\n");
+       p(tcps_lro_twopack, "\t\t%u time%s LRO coalesced 2 packets\n");
+       p(tcps_lro_multpack, "\t\t%u time%s LRO coalesced 3 or 4 packets\n");
+       p(tcps_lro_largepack, "\t\t%u time%s LRO coalesced 5 or more packets\n");
+
+       p(tcps_limited_txt, "\t%u limited transmit%s done\n");
+       p(tcps_early_rexmt, "\t%u early retransmit%s done\n");
+       p(tcps_sack_ackadv, "\t%u time%s cumulative ack advanced along with SACK\n");
 
+       if (interval > 0) {
+               bcopy(&tcpstat, &ptcpstat, len);
+               pr_swcsum = r_swcsum;
+               pt_swcsum = t_swcsum;
+       }
+
+#undef TCPDIFF
 #undef p
 #undef p1a
 #undef p2
@@ -538,15 +686,88 @@ tcp_stats(u_long off , char *name, int af )
 #undef p3
 }
 
+#if TARGET_OS_EMBEDDED
+/*
+ * Dump MPTCP statistics
+ */
+void
+mptcp_stats(uint32_t off , char *name, int af)
+{
+       static struct tcpstat ptcpstat;
+       struct tcpstat tcpstat;
+       size_t len = sizeof tcpstat;
+
+       if (sysctlbyname("net.inet.tcp.stats", &tcpstat, &len, 0, 0) < 0) {
+               warn("sysctl: net.inet.tcp.stats");
+               return;
+       }
+
+#ifdef INET6
+       if (mptcp_done != 0 && interval == 0)
+               return;
+       else
+               mptcp_done = 1;
+#endif
+
+       if (interval && vflag > 0)
+               print_time();
+       printf ("%s:\n", name);
+
+#define        MPTCPDIFF(f) (tcpstat.f - ptcpstat.f)
+#define        p(f, m) if (MPTCPDIFF(f) || sflag <= 1) \
+    printf(m, MPTCPDIFF(f), plural(MPTCPDIFF(f)))
+#define        p1a(f, m) if (MPTCPDIFF(f) || sflag <= 1) \
+    printf(m, MPTCPDIFF(f))
+#define        p2(f1, f2, m) if (MPTCPDIFF(f1) || MPTCPDIFF(f2) || sflag <= 1) \
+    printf(m, MPTCPDIFF(f1), plural(MPTCPDIFF(f1)), \
+        MPTCPDIFF(f2), plural(MPTCPDIFF(f2)))
+#define        p2a(f1, f2, m) if (MPTCPDIFF(f1) || MPTCPDIFF(f2) || sflag <= 1) \
+    printf(m, MPTCPDIFF(f1), plural(MPTCPDIFF(f1)), MPTCPDIFF(f2))
+#define        p3(f, m) if (MPTCPDIFF(f) || sflag <= 1) \
+    printf(m, MPTCPDIFF(f), plurales(MPTCPDIFF(f)))
+
+       p(tcps_mp_sndpacks, "\t%u data packet%s sent\n");
+       p(tcps_mp_sndbytes, "\t%u data byte%s sent\n");
+       p(tcps_mp_rcvtotal, "\t%u data packet%s received\n");
+       p(tcps_mp_rcvbytes, "\t%u data byte%s received\n");
+       p(tcps_invalid_mpcap, "\t%u packet%s with an invalid MPCAP option\n");
+       p(tcps_invalid_joins, "\t%u packet%s with an invalid MPJOIN option\n");
+       p(tcps_mpcap_fallback, "\t%u time%s primary subflow fell back to "
+           "TCP\n");
+       p(tcps_join_fallback, "\t%u time%s secondary subflow fell back to "
+           "TCP\n");
+       p(tcps_estab_fallback, "\t%u DSS option drop%s\n");
+       p(tcps_invalid_opt, "\t%u other invalid MPTCP option%s\n");
+       p(tcps_mp_reducedwin, "\t%u time%s the MPTCP subflow window was reduced\n");
+       p(tcps_mp_badcsum, "\t%u bad DSS checksum%s\n");
+       p(tcps_mp_oodata, "\t%u time%s received out of order data \n");
+       p3(tcps_mp_switches, "\t%u subflow switch%s\n");
+       
+       if (interval > 0) {
+               bcopy(&tcpstat, &ptcpstat, len);
+       }
+
+#undef MPTCPDIFF
+#undef p
+#undef p1a
+#undef p2
+#undef p2a
+#undef p3
+}
+#endif /* TARGET_OS_EMBEDDED */
+
 /*
  * Dump UDP statistics structure.
  */
 void
-udp_stats(u_long off , char *name, int af )
+udp_stats(uint32_t off , char *name, int af )
 {
+       static struct udpstat pudpstat;
        struct udpstat udpstat;
        size_t len = sizeof udpstat;
-       u_long delivered;
+       uint32_t delivered;
+       static uint32_t r_swcsum, pr_swcsum;
+       static uint32_t t_swcsum, pt_swcsum;
 
        if (sysctlbyname("net.inet.udp.stats", &udpstat, &len, 0, 0) < 0) {
                warn("sysctl: net.inet.udp.stats");
@@ -554,49 +775,84 @@ udp_stats(u_long off , char *name, int af )
        }
 
 #ifdef INET6
-       if (udp_done != 0)
+       if (udp_done != 0 && interval == 0)
                return;
        else
                udp_done = 1;
 #endif
 
+    if (interval && vflag > 0)
+        print_time();
        printf("%s:\n", name);
-#define        p(f, m) if (udpstat.f || sflag <= 1) \
-    printf(m, udpstat.f, plural(udpstat.f))
-#define        p1a(f, m) if (udpstat.f || sflag <= 1) \
-    printf(m, udpstat.f)
-       p(udps_ipackets, "\t%lu datagram%s received\n");
-       p1a(udps_hdrops, "\t%lu with incomplete header\n");
-       p1a(udps_badlen, "\t%lu with bad data length field\n");
-       p1a(udps_badsum, "\t%lu with bad checksum\n");
-#ifndef __APPLE__
-       p1a(udps_nosum, "\t%lu with no checksum\n");
-#endif
-       p1a(udps_noport, "\t%lu dropped due to no socket\n");
+
+#define        UDPDIFF(f) (udpstat.f - pudpstat.f)
+#define        p(f, m) if (UDPDIFF(f) || sflag <= 1) \
+    printf(m, UDPDIFF(f), plural(UDPDIFF(f)))
+#define        p1a(f, m) if (UDPDIFF(f) || sflag <= 1) \
+    printf(m, UDPDIFF(f))
+#define        p2(f1, f2, m) if (UDPDIFF(f1) || UDPDIFF(f2) || sflag <= 1) \
+    printf(m, UDPDIFF(f1), plural(UDPDIFF(f1)), UDPDIFF(f2), plural(UDPDIFF(f2)))
+       p(udps_ipackets, "\t%u datagram%s received\n");
+       p1a(udps_hdrops, "\t\t%u with incomplete header\n");
+       p1a(udps_badlen, "\t\t%u with bad data length field\n");
+       p1a(udps_badsum, "\t\t%u with bad checksum\n");
+       p1a(udps_nosum, "\t\t%u with no checksum\n");
+       r_swcsum = udpstat.udps_rcv_swcsum + udpstat.udps_rcv6_swcsum;
+       if ((r_swcsum - pr_swcsum) || sflag <= 1)
+        printf("\t\t%u checksummed in software\n", (r_swcsum - pr_swcsum));
+       p2(udps_rcv_swcsum, udps_rcv_swcsum_bytes,
+           "\t\t\t%u datagram%s (%u byte%s) over IPv4\n");
+#if INET6
+       p2(udps_rcv6_swcsum, udps_rcv6_swcsum_bytes,
+           "\t\t\t%u datagram%s (%u byte%s) over IPv6\n");
+#endif /* INET6 */
+       p1a(udps_noport, "\t\t%u dropped due to no socket\n");
        p(udps_noportbcast,
-           "\t%lu broadcast/multicast datagram%s dropped due to no socket\n");
-       p1a(udps_fullsock, "\t%lu dropped due to full socket buffers\n");
-       p1a(udpps_pcbhashmiss, "\t%lu not for hashed pcb\n");
-       delivered = udpstat.udps_ipackets -
-                   udpstat.udps_hdrops -
-                   udpstat.udps_badlen -
-                   udpstat.udps_badsum -
-                   udpstat.udps_noport -
-                   udpstat.udps_noportbcast -
-                   udpstat.udps_fullsock;
+           "\t\t%u broadcast/multicast datagram%s undelivered\n");
+       /* the next statistic is cumulative in udps_noportbcast */
+       p(udps_filtermcast,
+           "\t\t%u time%s multicast source filter matched\n");
+       p1a(udps_fullsock, "\t\t%u dropped due to full socket buffers\n");
+       p1a(udpps_pcbhashmiss, "\t\t%u not for hashed pcb\n");
+       delivered = UDPDIFF(udps_ipackets) -
+                   UDPDIFF(udps_hdrops) -
+                   UDPDIFF(udps_badlen) -
+                   UDPDIFF(udps_badsum) -
+                   UDPDIFF(udps_noport) -
+                   UDPDIFF(udps_noportbcast) -
+                   UDPDIFF(udps_fullsock);
        if (delivered || sflag <= 1)
-               printf("\t%lu delivered\n", delivered);
-       p(udps_opackets, "\t%lu datagram%s output\n");
+               printf("\t\t%u delivered\n", delivered);
+       p(udps_opackets, "\t%u datagram%s output\n");
+       t_swcsum = udpstat.udps_snd_swcsum + udpstat.udps_snd6_swcsum;
+       if ((t_swcsum - pt_swcsum) || sflag <= 1)
+        printf("\t\t%u checksummed in software\n", (t_swcsum - pt_swcsum));
+       p2(udps_snd_swcsum, udps_snd_swcsum_bytes,
+           "\t\t\t%u datagram%s (%u byte%s) over IPv4\n");
+#if INET6
+       p2(udps_snd6_swcsum, udps_snd6_swcsum_bytes,
+           "\t\t\t%u datagram%s (%u byte%s) over IPv6\n");
+#endif /* INET6 */
+
+       if (interval > 0) {
+               bcopy(&udpstat, &pudpstat, len);
+               pr_swcsum = r_swcsum;
+               pt_swcsum = t_swcsum;
+       }
+
+#undef UDPDIFF
 #undef p
 #undef p1a
+#undef p2
 }
 
 /*
  * Dump IP statistics structure.
  */
 void
-ip_stats(u_long off , char *name, int af )
+ip_stats(uint32_t off , char *name, int af )
 {
+       static struct ipstat pipstat;
        struct ipstat ipstat;
        size_t len = sizeof ipstat;
 
@@ -605,48 +861,116 @@ ip_stats(u_long off , char *name, int af )
                return;
        }
 
+    if (interval && vflag > 0)
+        print_time();
        printf("%s:\n", name);
 
-#define        p(f, m) if (ipstat.f || sflag <= 1) \
-    printf(m, ipstat.f, plural(ipstat.f))
-#define        p1a(f, m) if (ipstat.f || sflag <= 1) \
-    printf(m, ipstat.f)
-
-       p(ips_total, "\t%lu total packet%s received\n");
-       p(ips_badsum, "\t%lu bad header checksum%s\n");
-       p1a(ips_toosmall, "\t%lu with size smaller than minimum\n");
-       p1a(ips_tooshort, "\t%lu with data size < data length\n");
-       p1a(ips_toolong, "\t%lu with ip length > max ip packet size\n");
-       p1a(ips_badhlen, "\t%lu with header length < data size\n");
-       p1a(ips_badlen, "\t%lu with data length < header length\n");
-       p1a(ips_badoptions, "\t%lu with bad options\n");
-       p1a(ips_badvers, "\t%lu with incorrect version number\n");
-       p(ips_fragments, "\t%lu fragment%s received\n");
-       p(ips_fragdropped, "\t%lu fragment%s dropped (dup or out of space)\n");
-       p(ips_fragtimeout, "\t%lu fragment%s dropped after timeout\n");
-       p(ips_reassembled, "\t%lu packet%s reassembled ok\n");
-       p(ips_delivered, "\t%lu packet%s for this host\n");
-       p(ips_noproto, "\t%lu packet%s for unknown/unsupported protocol\n");
-       p(ips_forward, "\t%lu packet%s forwarded");
-       p(ips_fastforward, " (%lu packet%s fast forwarded)");
-       if (ipstat.ips_forward || sflag <= 1) 
+#define        IPDIFF(f) (ipstat.f - pipstat.f)
+#define        p(f, m) if (IPDIFF(f) || sflag <= 1) \
+    printf(m, IPDIFF(f), plural(IPDIFF(f)))
+#define        p1a(f, m) if (IPDIFF(f) || sflag <= 1) \
+    printf(m, IPDIFF(f))
+#define        p2(f1, f2, m) if (IPDIFF(f1) || IPDIFF(f2) || sflag <= 1) \
+    printf(m, IPDIFF(f1), plural(IPDIFF(f1)), IPDIFF(f2), plural(IPDIFF(f2)))
+
+       p(ips_total, "\t%u total packet%s received\n");
+       p(ips_badsum, "\t\t%u bad header checksum%s\n");
+       p2(ips_rcv_swcsum, ips_rcv_swcsum_bytes,
+           "\t\t%u header%s (%u byte%s) checksummed in software\n");
+       p1a(ips_toosmall, "\t\t%u with size smaller than minimum\n");
+       p1a(ips_tooshort, "\t\t%u with data size < data length\n");
+       p1a(ips_adj, "\t\t%u with data size > data length\n");
+       p(ips_adj_hwcsum_clr,
+           "\t\t\t%u packet%s forced to software checksum\n");
+       p1a(ips_toolong, "\t\t%u with ip length > max ip packet size\n");
+       p1a(ips_badhlen, "\t\t%u with header length < data size\n");
+       p1a(ips_badlen, "\t\t%u with data length < header length\n");
+       p1a(ips_badoptions, "\t\t%u with bad options\n");
+       p1a(ips_badvers, "\t\t%u with incorrect version number\n");
+       p(ips_fragments, "\t\t%u fragment%s received\n");
+       p1a(ips_fragdropped, "\t\t\t%u dropped (dup or out of space)\n");
+       p1a(ips_fragtimeout, "\t\t\t%u dropped after timeout\n");
+       p1a(ips_reassembled, "\t\t\t%u reassembled ok\n");
+       p(ips_delivered, "\t\t%u packet%s for this host\n");
+       p(ips_noproto, "\t\t%u packet%s for unknown/unsupported protocol\n");
+       p(ips_forward, "\t\t%u packet%s forwarded");
+       p(ips_fastforward, " (%u packet%s fast forwarded)");
+       if (IPDIFF(ips_forward) || sflag <= 1)
                putchar('\n');
-       p(ips_cantforward, "\t%lu packet%s not forwardable\n");
+       p(ips_cantforward, "\t\t%u packet%s not forwardable\n");
        p(ips_notmember,
-         "\t%lu packet%s received for unknown multicast group\n");
-       p(ips_redirectsent, "\t%lu redirect%s sent\n");
-       p(ips_localout, "\t%lu packet%s sent from this host\n");
-       p(ips_rawout, "\t%lu packet%s sent with fabricated ip header\n");
+         "\t\t%u packet%s received for unknown multicast group\n");
+       p(ips_redirectsent, "\t\t%u redirect%s sent\n");
+       p(ips_localout, "\t%u packet%s sent from this host\n");
+       p(ips_rawout, "\t\t%u packet%s sent with fabricated ip header\n");
        p(ips_odropped,
-         "\t%lu output packet%s dropped due to no bufs, etc.\n");
-       p(ips_noroute, "\t%lu output packet%s discarded due to no route\n");
-       p(ips_fragmented, "\t%lu output datagram%s fragmented\n");
-       p(ips_ofragments, "\t%lu fragment%s created\n");
-       p(ips_cantfrag, "\t%lu datagram%s that can't be fragmented\n");
-       p(ips_nogif, "\t%lu tunneling packet%s that can't find gif\n");
-       p(ips_badaddr, "\t%lu datagram%s with bad address in header\n");
+         "\t\t%u output packet%s dropped due to no bufs, etc.\n");
+       p(ips_noroute, "\t\t%u output packet%s discarded due to no route\n");
+       p(ips_fragmented, "\t\t%u output datagram%s fragmented\n");
+       p(ips_ofragments, "\t\t%u fragment%s created\n");
+       p(ips_cantfrag, "\t\t%u datagram%s that can't be fragmented\n");
+       p(ips_nogif, "\t\t%u tunneling packet%s that can't find gif\n");
+       p(ips_badaddr, "\t\t%u datagram%s with bad address in header\n");
+       p(ips_pktdropcntrl,
+           "\t\t%u packet%s dropped due to no bufs for control data\n");
+       p2(ips_snd_swcsum, ips_snd_swcsum_bytes,
+           "\t\t%u header%s (%u byte%s) checksummed in software\n");
+
+       if (interval > 0)
+               bcopy(&ipstat, &pipstat, len);
+
+#undef IPDIFF
 #undef p
 #undef p1a
+#undef p2
+}
+
+/*
+ * Dump ARP statistics structure.
+ */
+void
+arp_stats(uint32_t off, char *name, int af)
+{
+       static struct arpstat parpstat;
+       struct arpstat arpstat;
+       size_t len = sizeof (arpstat);
+
+       if (sysctlbyname("net.link.ether.inet.stats", &arpstat,
+           &len, 0, 0) < 0) {
+               warn("sysctl: net.link.ether.inet.stats");
+               return;
+       }
+
+    if (interval && vflag > 0)
+        print_time();
+       printf("%s:\n", name);
+
+#define        ARPDIFF(f) (arpstat.f - parpstat.f)
+#define        p(f, m) if (ARPDIFF(f) || sflag <= 1) \
+    printf(m, ARPDIFF(f), plural(ARPDIFF(f)))
+#define        p2(f, m) if (ARPDIFF(f) || sflag <= 1) \
+    printf(m, ARPDIFF(f), pluralies(ARPDIFF(f)))
+
+       p(txrequests, "\t%u ARP request%s sent\n");
+       p2(txreplies, "\t%u ARP repl%s sent\n");
+       p(txannounces, "\t%u ARP announcement%s sent\n");
+       p(rxrequests, "\t%u ARP request%s received\n");
+       p2(rxreplies, "\t%u ARP repl%s received\n");
+       p(received, "\t%u total ARP packet%s received\n");
+       p(txconflicts, "\t%u ARP conflict probe%s sent\n");
+       p(invalidreqs, "\t%u invalid ARP resolve request%s\n");
+       p(reqnobufs, "\t%u total packet%s dropped due to lack of memory\n");
+       p(dropped, "\t%u total packet%s dropped due to no ARP entry\n");
+       p(purged, "\t%u total packet%s dropped during ARP entry removal\n");
+       p2(timeouts, "\t%u ARP entr%s timed out\n");
+       p(dupips, "\t%u Duplicate IP%s seen\n");
+
+       if (interval > 0)
+               bcopy(&arpstat, &parpstat, len);
+
+#undef ARPDIFF
+#undef p
+#undef p2
 }
 
 static char *icmpnames[] = {
@@ -675,8 +999,9 @@ static      char *icmpnames[] = {
  * Dump ICMP statistics.
  */
 void
-icmp_stats(u_long off , char *name, int af )
+icmp_stats(uint32_t off , char *name, int af )
 {
+       static struct icmpstat picmpstat;
        struct icmpstat icmpstat;
        int i, first;
        int mib[4];             /* CTL_NET + PF_INET + IPPROTO_ICMP + req */
@@ -692,41 +1017,46 @@ icmp_stats(u_long off , char *name, int af )
        if (sysctl(mib, 4, &icmpstat, &len, (void *)0, 0) < 0)
                return;         /* XXX should complain, but not traditional */
 
+    if (interval && vflag > 0)
+        print_time();
        printf("%s:\n", name);
 
-#define        p(f, m) if (icmpstat.f || sflag <= 1) \
-    printf(m, icmpstat.f, plural(icmpstat.f))
-#define        p1a(f, m) if (icmpstat.f || sflag <= 1) \
-    printf(m, icmpstat.f)
+#define        ICMPDIFF(f) (icmpstat.f - picmpstat.f)
+#define        p(f, m) if (ICMPDIFF(f) || sflag <= 1) \
+    printf(m, ICMPDIFF(f), plural(ICMPDIFF(f)))
+#define        p1a(f, m) if (ICMPDIFF(f) || sflag <= 1) \
+    printf(m, ICMPDIFF(f))
 
-       p(icps_error, "\t%lu call%s to icmp_error\n");
+       p(icps_error, "\t%u call%s to icmp_error\n");
        p(icps_oldicmp,
-           "\t%lu error%s not generated 'cuz old message was icmp\n");
+           "\t%u error%s not generated 'cuz old message was icmp\n");
        for (first = 1, i = 0; i < ICMP_MAXTYPE + 1; i++)
-               if (icmpstat.icps_outhist[i] != 0) {
+               if (ICMPDIFF(icps_outhist[i]) != 0) {
                        if (first) {
                                printf("\tOutput histogram:\n");
                                first = 0;
                        }
-                       printf("\t\t%s: %lu\n", icmpnames[i],
-                               icmpstat.icps_outhist[i]);
+                       printf("\t\t%s: %u\n", icmpnames[i],
+                               ICMPDIFF(icps_outhist[i]));
                }
-       p(icps_badcode, "\t%lu message%s with bad code fields\n");
-       p(icps_tooshort, "\t%lu message%s < minimum length\n");
-       p(icps_checksum, "\t%lu bad checksum%s\n");
-       p(icps_badlen, "\t%lu message%s with bad length\n");
-       p1a(icps_bmcastecho, "\t%lu multicast echo requests ignored\n");
-       p1a(icps_bmcasttstamp, "\t%lu multicast timestamp requests ignored\n");
+       p(icps_badcode, "\t%u message%s with bad code fields\n");
+       p(icps_tooshort, "\t%u message%s < minimum length\n");
+       p(icps_checksum, "\t%u bad checksum%s\n");
+       p(icps_badlen, "\t%u message%s with bad length\n");
+       p1a(icps_bmcastecho, "\t%u multicast echo requests ignored\n");
+       p1a(icps_bmcasttstamp, "\t%u multicast timestamp requests ignored\n");
        for (first = 1, i = 0; i < ICMP_MAXTYPE + 1; i++)
-               if (icmpstat.icps_inhist[i] != 0) {
+               if (ICMPDIFF(icps_inhist[i]) != 0) {
                        if (first) {
                                printf("\tInput histogram:\n");
                                first = 0;
                        }
-                       printf("\t\t%s: %lu\n", icmpnames[i],
-                               icmpstat.icps_inhist[i]);
+                       printf("\t\t%s: %u\n", icmpnames[i],
+                               ICMPDIFF(icps_inhist[i]));
                }
-       p(icps_reflect, "\t%lu message response%s generated\n");
+       p(icps_reflect, "\t%u message response%s generated\n");
+
+#undef ICMPDIFF
 #undef p
 #undef p1a
        mib[3] = ICMPCTL_MASKREPL;
@@ -735,39 +1065,71 @@ icmp_stats(u_long off , char *name, int af )
                return;
        printf("\tICMP address mask responses are %sabled\n", 
               i ? "en" : "dis");
+
+       if (interval > 0)
+               bcopy(&icmpstat, &picmpstat, sizeof (icmpstat));
 }
 
 /*
  * Dump IGMP statistics structure.
  */
 void
-igmp_stats(u_long off , char *name, int af )
+igmp_stats(uint32_t off , char *name, int af )
 {
-       struct igmpstat igmpstat;
+       static struct igmpstat_v3 pigmpstat;
+       struct igmpstat_v3 igmpstat;
        size_t len = sizeof igmpstat;
 
-       if (sysctlbyname("net.inet.igmp.stats", &igmpstat, &len, 0, 0) < 0) {
-               warn("sysctl: net.inet.igmp.stats");
+       if (sysctlbyname("net.inet.igmp.v3stats", &igmpstat, &len, 0, 0) < 0) {
+               warn("sysctl: net.inet.igmp.v3stats");
                return;
        }
 
+       if (igmpstat.igps_version != IGPS_VERSION_3) {
+               warnx("%s: version mismatch (%d != %d)", __func__,
+                   igmpstat.igps_version, IGPS_VERSION_3);
+       }
+       if (igmpstat.igps_len != IGPS_VERSION3_LEN) {
+               warnx("%s: size mismatch (%d != %d)", __func__,
+                   igmpstat.igps_len, IGPS_VERSION3_LEN);
+       }
+
+    if (interval && vflag > 0)
+        print_time();
        printf("%s:\n", name);
 
-#define        p(f, m) if (igmpstat.f || sflag <= 1) \
-    printf(m, igmpstat.f, plural(igmpstat.f))
-#define        py(f, m) if (igmpstat.f || sflag <= 1) \
-    printf(m, igmpstat.f, igmpstat.f != 1 ? "ies" : "y")
-       p(igps_rcv_total, "\t%u message%s received\n");
-        p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
-        p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
-        py(igps_rcv_queries, "\t%u membership quer%s received\n");
-        py(igps_rcv_badqueries, "\t%u membership quer%s received with invalid field(s)\n");
-        p(igps_rcv_reports, "\t%u membership report%s received\n");
-        p(igps_rcv_badreports, "\t%u membership report%s received with invalid field(s)\n");
-        p(igps_rcv_ourreports, "\t%u membership report%s received for groups to which we belong\n");
-        p(igps_snd_reports, "\t%u membership report%s sent\n");
-#undef p
-#undef py
+#define        IGMPDIFF(f) ((uintmax_t)(igmpstat.f - pigmpstat.f))
+#define        p64(f, m) if (IGMPDIFF(f) || sflag <= 1) \
+    printf(m, IGMPDIFF(f), plural(IGMPDIFF(f)))
+#define        py64(f, m) if (IGMPDIFF(f) || sflag <= 1) \
+    printf(m, IGMPDIFF(f), IGMPDIFF(f) != 1 ? "ies" : "y")
+
+       p64(igps_rcv_total, "\t%ju message%s received\n");
+       p64(igps_rcv_tooshort, "\t%ju message%s received with too few bytes\n");
+       p64(igps_rcv_badttl, "\t%ju message%s received with wrong TTL\n");
+       p64(igps_rcv_badsum, "\t%ju message%s received with bad checksum\n");
+       py64(igps_rcv_v1v2_queries, "\t%ju V1/V2 membership quer%s received\n");
+       py64(igps_rcv_v3_queries, "\t%ju V3 membership quer%s received\n");
+       py64(igps_rcv_badqueries,
+           "\t%ju membership quer%s received with invalid field(s)\n");
+       py64(igps_rcv_gen_queries, "\t%ju general quer%s received\n");
+       py64(igps_rcv_group_queries, "\t%ju group quer%s received\n");
+       py64(igps_rcv_gsr_queries, "\t%ju group-source quer%s received\n");
+       py64(igps_drop_gsr_queries, "\t%ju group-source quer%s dropped\n");
+       p64(igps_rcv_reports, "\t%ju membership report%s received\n");
+       p64(igps_rcv_badreports,
+           "\t%ju membership report%s received with invalid field(s)\n");
+       p64(igps_rcv_ourreports,
+"\t%ju membership report%s received for groups to which we belong\n");
+        p64(igps_rcv_nora, "\t%ju V3 report%s received without Router Alert\n");
+        p64(igps_snd_reports, "\t%ju membership report%s sent\n");
+
+       if (interval > 0)
+               bcopy(&igmpstat, &pigmpstat, len);
+
+#undef IGMPDIFF
+#undef p64
+#undef py64
 }
 
 /*
@@ -781,9 +1143,9 @@ inetprint(struct in_addr *in, int port, char *proto, int numeric_port)
        int width;
 
        if (Wflag)
-           sprintf(line, "%s.", inetname(in));
+           snprintf(line, sizeof(line), "%s.", inetname(in));
        else
-           sprintf(line, "%.*s.", (Aflag && !numeric_port) ? 12 : 16, inetname(in));
+           snprintf(line, sizeof(line), "%.*s.", (Aflag && !numeric_port) ? 12 : 16, inetname(in));
        cp = index(line, '\0');
        if (!numeric_port && port)
 #ifdef _SERVICE_CACHE_
@@ -792,9 +1154,9 @@ inetprint(struct in_addr *in, int port, char *proto, int numeric_port)
                sp = getservbyport((int)port, proto);
 #endif
        if (sp || port == 0)
-               sprintf(cp, "%.15s ", sp ? sp->s_name : "*");
+               snprintf(cp, sizeof(line) - (cp - line), "%.15s ", sp ? sp->s_name : "*");
        else
-               sprintf(cp, "%d ", ntohs((u_short)port));
+               snprintf(cp, sizeof(line) - (cp - line), "%d ", ntohs((u_short)port));
        width = (Aflag && !Wflag) ? 18 : 22;
        if (Wflag)
            printf("%-*s ", width, line);
@@ -834,14 +1196,14 @@ inetname(struct in_addr *inp)
                }
        }
        if (inp->s_addr == INADDR_ANY)
-               strcpy(line, "*");
+               strlcpy(line, "*", sizeof(line));
        else if (cp) {
                strncpy(line, cp, sizeof(line) - 1);
                line[sizeof(line) - 1] = '\0';
        } else {
                inp->s_addr = ntohl(inp->s_addr);
 #define C(x)   ((u_int)((x) & 0xff))
-               sprintf(line, "%u.%u.%u.%u", C(inp->s_addr >> 24),
+               snprintf(line, sizeof(line), "%u.%u.%u.%u", C(inp->s_addr >> 24),
                    C(inp->s_addr >> 16), C(inp->s_addr >> 8), C(inp->s_addr));
        }
        return (line);