X-Git-Url: https://git.saurik.com/apple/network_cmds.git/blobdiff_plain/b7080c8e96625177072137d504eb8e9c9d748e49..5902acfc600aa7d331608b1286d6af0b21f6a7ba:/netstat.tproj/if.c

diff --git a/netstat.tproj/if.c b/netstat.tproj/if.c
index 43be850..881e8ae 100644
--- a/netstat.tproj/if.c
+++ b/netstat.tproj/if.c
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 2008-2010 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
  *	The Regents of the University of California.  All rights reserved.
@@ -36,214 +63,340 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-	"$Id: if.c,v 1.1.1.2 2000/01/11 01:48:51 wsanchez Exp $";
+	"$Id: if.c,v 1.7 2006/01/16 04:53:59 lindak Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/protosw.h>
 #include <sys/socket.h>
+#include <sys/sysctl.h>
 #include <sys/time.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/if_mib.h>
 #include <net/ethernet.h>
+#include <net/route.h>
+
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 
-#ifdef IPX
-#include <netipx/ipx.h>
-#include <netipx/ipx_if.h>
-#endif
-
-#ifdef NS
-#include <netns/ns.h>
-#include <netns/ns_if.h>
-#endif
-#ifdef ISO
-#include <netiso/iso.h>
-#include <netiso/iso_var.h>
-#endif
 #include <arpa/inet.h>
 
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <err.h>
 
 #include "netstat.h"
 
 #define	YES	1
 #define	NO	0
 
-static void sidewaysintpr __P((u_int, u_long));
-static void catchalarm __P((int));
+#define ROUNDUP(a, size) (((a) & ((size) - 1)) ? (1 + ((a)|(size - 1))) : (a))
+
+#define NEXT_SA(p) (struct sockaddr *) \
+    ((caddr_t)p + (p->sa_len ? ROUNDUP(p->sa_len, sizeof(uint32_t)) : \
+    sizeof(uint32_t)))
+
+static void sidewaysintpr ();
+static void catchalarm (int);
+
+#ifdef INET6
+char *netname6 (struct sockaddr_in6 *, struct sockaddr *);
+static char ntop_buf[INET6_ADDRSTRLEN];		/* for inet_ntop() */
+#endif
+
+/*
+ * Display a formatted value, or a '-' in the same space.
+ */
+static void
+show_stat(const char *fmt, int width, u_int64_t value, short showvalue)
+{
+	char newfmt[32];
+
+	/* Construct the format string */
+	if (showvalue) {
+		sprintf(newfmt, "%%%d%s", width, fmt);
+		printf(newfmt, value);
+	} else {
+		sprintf(newfmt, "%%%ds", width);
+		printf(newfmt, "-");
+	}
+}
+
+size_t
+get_rti_info(int addrs, struct sockaddr *sa, struct sockaddr **rti_info)
+{
+    int			i;
+    size_t		len = 0;
+
+    for (i = 0; i < RTAX_MAX; i++) {
+        if (addrs & (1 << i)) {
+            rti_info[i] = sa;
+            if (sa->sa_len < sizeof(struct sockaddr))
+                len += sizeof(struct sockaddr);
+            else
+                len += sa->sa_len;
+            sa = NEXT_SA(sa);
+        } else {
+            rti_info[i] = NULL;
+        }
+    }
+    return len;
+}
+
+static void
+multipr(int family, char *buf, char *lim)
+{
+    char  *next;
+
+    for (next = buf; next < lim; ) {
+		struct ifma_msghdr2	*ifmam = (struct ifma_msghdr2 *)next;
+		struct sockaddr *rti_info[RTAX_MAX];
+		struct sockaddr *sa;
+		const char *fmt = 0;
+		
+		next += ifmam->ifmam_msglen;
+		if (ifmam->ifmam_type == RTM_IFINFO2)
+			break;
+		else if (ifmam->ifmam_type != RTM_NEWMADDR2)
+			continue;
+		get_rti_info(ifmam->ifmam_addrs, (struct sockaddr*)(ifmam + 1), rti_info);
+		sa = rti_info[RTAX_IFA];
+		
+		if (sa->sa_family != family)
+			continue;
+		switch (sa->sa_family) {
+			case AF_INET: {
+				struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+				
+				fmt = routename(sin->sin_addr.s_addr);
+				break;
+			}
+	#ifdef INET6
+			case AF_INET6: {
+				struct sockaddr_in6 sin6;
+
+				memcpy(&sin6, sa, sizeof(struct sockaddr_in6));
+
+				if (IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
+					IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr)) {
+					sin6.sin6_scope_id = ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
+					sin6.sin6_addr.s6_addr[2] = 0;
+					sin6.sin6_addr.s6_addr[3] = 0;
+				}
+
+				printf("%23s %-19.19s(refs: %d)\n", "",
+				    inet_ntop(AF_INET6, &sin6.sin6_addr,
+				    ntop_buf, sizeof(ntop_buf)),
+						ifmam->ifmam_refcount);
+				break;
+			}
+	#endif /* INET6 */
+			case AF_LINK: {
+				struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
+				
+				switch (sdl->sdl_type) {
+				case IFT_ETHER:
+				case IFT_FDDI:
+					fmt = ether_ntoa((struct ether_addr *)
+						LLADDR(sdl));
+					break;
+				}
+				break;
+			}
+		}
+		if (fmt)
+			printf("%23s %s\n", "", fmt);
+	}
+}
 
 /*
  * Print a description of the network interfaces.
  */
 void
-intpr(interval, ifnetaddr)
-	int interval;
-	u_long ifnetaddr;
+intpr(void (*pfunc)(char *))
 {
-	struct ifnet ifnet;
-	struct ifnethead ifnethead;
-	union {
-		struct ifaddr ifa;
-		struct in_ifaddr in;
-#ifdef IPX
-		struct ipx_ifaddr ipx;
-#endif
-#ifdef NS
-		struct ns_ifaddr ns;
-#endif
-#ifdef ISO
-		struct iso_ifaddr iso;
-#endif
-	} ifaddr;
-	u_long ifaddraddr;
-	u_long ifaddrfound;
-	u_long ifnetfound;
-	struct sockaddr *sa;
-	char name[32], tname[16];
-
-	if (ifnetaddr == 0) {
-		printf("ifnet: symbol not defined\n");
-		return;
-	}
+	u_int64_t opackets = 0;
+	u_int64_t ipackets = 0;
+	u_int64_t obytes = 0;
+	u_int64_t ibytes = 0;
+	u_int64_t oerrors = 0;
+	u_int64_t ierrors = 0;
+	u_int64_t collisions = 0;
+	uint32_t mtu = 0;
+	short timer = 0;
+	int drops = 0;
+	struct sockaddr *sa = NULL;
+	char name[32];
+	short network_layer;
+	short link_layer;
+    int mib[6];
+    char *buf = NULL, *lim, *next;
+	size_t len;
+	struct if_msghdr *ifm;
+	struct sockaddr *rti_info[RTAX_MAX];
+	unsigned int ifindex = 0;
+	
 	if (interval) {
-		sidewaysintpr((unsigned)interval, ifnetaddr);
+		sidewaysintpr();
 		return;
 	}
-	if (kread(ifnetaddr, (char *)&ifnethead, sizeof ifnethead))
+	
+	if (interface != 0)
+		ifindex = if_nametoindex(interface);
+	
+	mib[0]	= CTL_NET;			// networking subsystem
+	mib[1]	= PF_ROUTE;			// type of information
+	mib[2]	= 0;				// protocol (IPPROTO_xxx)
+	mib[3]	= 0;				// address family
+	mib[4]	= NET_RT_IFLIST2;	// operation
+	mib[5]	= 0;
+	if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0)
 		return;
-	ifnetaddr = (u_long)ifnethead.tqh_first;
-	if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet))
+	if ((buf = malloc(len)) == NULL) {
+		printf("malloc failed\n");
+		exit(1);
+	}
+	if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
+		if (buf)
+			free(buf);
 		return;
-
-	printf("%-5.5s %-5.5s %-13.13s %-15.15s %8.8s %5.5s",
-		"Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs");
-	if (bflag)
-		printf(" %10.10s","Ibytes");
-	printf(" %8.8s %5.5s", "Opkts", "Oerrs");
-	if (bflag)
-		printf(" %10.10s","Obytes");
-	printf(" %5s", "Coll");
-	if (tflag)
-		printf(" %s", "Time");
-	if (dflag)
-		printf(" %s", "Drop");
-	putchar('\n');
-	ifaddraddr = 0;
-	while (ifnetaddr || ifaddraddr) {
-		struct sockaddr_in *sin;
-		register char *cp;
+	}
+	if (!pfunc) {
+		printf("%-5.5s %-5.5s %-13.13s %-15.15s %8.8s %5.5s",
+		       "Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs");
+		if (bflag)
+			printf(" %10.10s","Ibytes");
+		printf(" %8.8s %5.5s", "Opkts", "Oerrs");
+		if (bflag)
+			printf(" %10.10s","Obytes");
+		printf(" %5s", "Coll");
+		if (tflag)
+			printf(" %s", "Time");
+		if (dflag)
+			printf(" %s", "Drop");
+		putchar('\n');
+	}
+    lim = buf + len;
+    for (next = buf; next < lim; ) {
+		char *cp;
 		int n, m;
+		
+		network_layer = 0;
+		link_layer = 0;
+        ifm = (struct if_msghdr *)next;
+		next += ifm->ifm_msglen;
+
+        if (ifm->ifm_type == RTM_IFINFO2) {
+			struct if_msghdr2 *if2m = (struct if_msghdr2 *)ifm;
+            struct sockaddr_dl	*sdl = (struct sockaddr_dl *)(if2m + 1);
 
-		if (ifaddraddr == 0) {
-			ifnetfound = ifnetaddr;
-			if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) ||
-			    kread((u_long)ifnet.if_name, tname, 16))
-				return;
-			tname[15] = '\0';
-			ifnetaddr = (u_long)ifnet.if_link.tqe_next;
-			snprintf(name, 32, "%s%d", tname, ifnet.if_unit);
-			if (interface != 0 && (strcmp(name, interface) != 0))
+			strncpy(name, sdl->sdl_data, sdl->sdl_nlen);
+			name[sdl->sdl_nlen] = 0;
+			if (interface != 0 && if2m->ifm_index != ifindex)
 				continue;
 			cp = index(name, '\0');
-			if ((ifnet.if_flags&IFF_UP) == 0)
+
+			if (pfunc) {
+				(*pfunc)(name);
+				continue;
+			}
+
+			if ((if2m->ifm_flags & IFF_UP) == 0)
 				*cp++ = '*';
 			*cp = '\0';
-			ifaddraddr = (u_long)ifnet.if_addrhead.tqh_first;
+
+			/*
+			 * Get the interface stats.  These may get
+			 * overriden below on a per-interface basis.
+			 */
+			opackets = if2m->ifm_data.ifi_opackets;
+			ipackets = if2m->ifm_data.ifi_ipackets;
+			obytes = if2m->ifm_data.ifi_obytes;
+			ibytes = if2m->ifm_data.ifi_ibytes;
+			oerrors =if2m->ifm_data.ifi_oerrors;
+			ierrors = if2m->ifm_data.ifi_ierrors;
+			collisions = if2m->ifm_data.ifi_collisions;
+			timer = if2m->ifm_timer;
+			drops = if2m->ifm_snd_drops;
+			mtu = if2m->ifm_data.ifi_mtu;
+
+            get_rti_info(if2m->ifm_addrs, (struct sockaddr*)(if2m + 1), rti_info);
+			sa = rti_info[RTAX_IFP];
+        } else if (ifm->ifm_type == RTM_NEWADDR) {
+            struct ifa_msghdr	*ifam = (struct ifa_msghdr *)ifm;
+			
+			if (interface != 0 && ifam->ifam_index != ifindex)
+				continue;
+            get_rti_info(ifam->ifam_addrs, (struct sockaddr*)(ifam + 1), rti_info);
+			sa = rti_info[RTAX_IFA];
+		} else {
+			continue;
 		}
-		printf("%-5.5s %-5lu ", name, ifnet.if_mtu);
-		ifaddrfound = ifaddraddr;
-		if (ifaddraddr == 0) {
+		printf("%-5.5s %-5u ", name, mtu);
+
+		if (sa == 0) {
 			printf("%-13.13s ", "none");
 			printf("%-15.15s ", "none");
 		} else {
-			if (kread(ifaddraddr, (char *)&ifaddr, sizeof ifaddr)) {
-				ifaddraddr = 0;
-				continue;
-			}
-#define CP(x) ((char *)(x))
-			cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
-				CP(&ifaddr); sa = (struct sockaddr *)cp;
 			switch (sa->sa_family) {
 			case AF_UNSPEC:
 				printf("%-13.13s ", "none");
 				printf("%-15.15s ", "none");
 				break;
-			case AF_INET:
-				sin = (struct sockaddr_in *)sa;
-#ifdef notdef
-				/* can't use inet_makeaddr because kernel
-				 * keeps nets unshifted.
-				 */
-				in = inet_makeaddr(ifaddr.in.ia_subnet,
-					INADDR_ANY);
-				printf("%-13.13s ", netname(in.s_addr,
-				    ifaddr.in.ia_subnetmask));
-#else
+
+			case AF_INET: {
+				struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+				struct sockaddr_in mask;
+				
+				mask.sin_addr.s_addr = 0;
+				memcpy(&mask,
+				       rti_info[RTAX_NETMASK],
+				       ((struct sockaddr_in *)rti_info[RTAX_NETMASK])->sin_len);
+				
 				printf("%-13.13s ",
-				    netname(htonl(ifaddr.in.ia_subnet),
-				    ifaddr.in.ia_subnetmask));
-#endif
+				       netname(sin->sin_addr.s_addr & mask.sin_addr.s_addr,
+				    ntohl(mask.sin_addr.s_addr)));
+
 				printf("%-15.15s ",
 				    routename(sin->sin_addr.s_addr));
+
+				network_layer = 1;
 				break;
-#ifdef IPX
-
-			case AF_IPX:
-				{
-				struct sockaddr_ipx *sipx =
-					(struct sockaddr_ipx *)sa;
-				u_long net;
-				char netnum[10];
-
-				*(union ipx_net *) &net = sipx->sipx_addr.x_net;
-				sprintf(netnum, "%lx", (u_long)ntohl(net));
-				printf("ipx:%-8s ", netnum);
-/*				printf("ipx:%-8s ", netname(net, 0L)); */
-				printf("%-15s ",
-				    ipx_phost((struct sockaddr *)sipx));
-				}
-				break;
-#endif
-#if 0
-			case AF_APPLETALK:
-				printf("atalk:%-12.12s ",atalk_print(sa,0x10) );
-				printf("%-9.9s  ",atalk_print(sa,0x0b) );
-				break;
-#endif
-#ifdef NS
-			case AF_NS:
-				{
-				struct sockaddr_ns *sns =
-					(struct sockaddr_ns *)sa;
-				u_long net;
-				char netnum[10];
-
-				*(union ns_net *) &net = sns->sns_addr.x_net;
-				sprintf(netnum, "%lxH", ntohl(net));
-				upHex(netnum);
-				printf("ns:%-8s ", netnum);
-				printf("%-15s ",
-				    ns_phost((struct sockaddr *)sns));
-				}
+			}
+#ifdef INET6
+			case AF_INET6: {
+				struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
+				struct sockaddr *mask = (struct sockaddr *)rti_info[RTAX_NETMASK];
+
+				printf("%-11.11s ",
+				       netname6(sin6,
+						mask));
+				printf("%-17.17s ",
+				    (char *)inet_ntop(AF_INET6,
+					&sin6->sin6_addr,
+					ntop_buf, sizeof(ntop_buf)));
+
+				network_layer = 1;
 				break;
-#endif
-			case AF_LINK:
-				{
+			}
+#endif /*INET6*/
+			case AF_LINK: {
 				struct sockaddr_dl *sdl =
 					(struct sockaddr_dl *)sa;
-				    cp = (char *)LLADDR(sdl);
-				    n = sdl->sdl_alen;
-				}
-				m = printf("%-11.11s ", "<Link>");
+				char linknum[10];
+				cp = (char *)LLADDR(sdl);
+				n = sdl->sdl_alen;
+				sprintf(linknum, "<Link#%d>", sdl->sdl_index);
+				m = printf("%-11.11s ", linknum);
 				goto hexprint;
+			}
+
 			default:
 				m = printf("(%d)", sa->sa_family);
 				for (cp = sa->sa_len + (char *)sa;
@@ -253,89 +406,64 @@ intpr(interval, ifnetaddr)
 			hexprint:
 				while (--n >= 0)
 					m += printf("%02x%c", *cp++ & 0xff,
-						    n > 0 ? '.' : ' ');
+						    n > 0 ? ':' : ' ');
 				m = 30 - m;
 				while (m-- > 0)
 					putchar(' ');
+
+				link_layer = 1;
 				break;
 			}
-			ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next;
+			}
+
+		show_stat("llu", 8, ipackets, link_layer|network_layer);
+		printf(" ");
+		show_stat("llu", 5, ierrors, link_layer);
+		printf(" ");
+		if (bflag) {
+			show_stat("llu", 10, ibytes, link_layer|network_layer);
+			printf(" ");
+		}
+		show_stat("llu", 8, opackets, link_layer|network_layer);
+		printf(" ");
+		show_stat("llu", 5, oerrors, link_layer);
+		printf(" ");
+		if (bflag) {
+			show_stat("llu", 10, obytes, link_layer|network_layer);
+			printf(" ");
+		}
+		show_stat("llu", 5, collisions, link_layer);
+		if (tflag) {
+			printf(" ");
+			show_stat("ll", 3, timer, link_layer);
+		}
+		if (dflag) {
+			printf(" ");
+			show_stat("ll", 3, drops, link_layer);
 		}
-		printf("%8lu %5lu ",
-		    ifnet.if_ipackets, ifnet.if_ierrors);
-		if (bflag)
-			printf("%10lu ", ifnet.if_ibytes);
-		printf("%8lu %5lu ",
-		    ifnet.if_opackets, ifnet.if_oerrors);
-		if (bflag)
-			printf("%10lu ", ifnet.if_obytes);
-		printf("%5lu", ifnet.if_collisions);
-		if (tflag)
-			printf(" %3d", ifnet.if_timer);
-		if (dflag)
-			printf(" %3d", ifnet.if_snd.ifq_drops);
 		putchar('\n');
-		if (aflag && ifaddrfound) {
-			/*
-			 * Print family's multicast addresses
-			 */
-			u_long multiaddr;
-			struct ifmultiaddr ifma;
-			union {
-				struct sockaddr sa;
-				struct sockaddr_in in;
-				struct sockaddr_dl dl;
-			} msa;
-			const char *fmt;
-
-			for(multiaddr = (u_long)ifnet.if_multiaddrs.lh_first;
-			    multiaddr;
-			    multiaddr = (u_long)ifma.ifma_link.le_next) {
-				if (kread(multiaddr, (char *)&ifma,
-					  sizeof ifma))
-					break;
-				if (kread((u_long)ifma.ifma_addr, (char *)&msa,
-					  sizeof msa))
-					break;
-				if (msa.sa.sa_family != sa->sa_family)
-					continue;
-				
-				fmt = 0;
-				switch (msa.sa.sa_family) {
-				case AF_INET:
-					fmt = routename(msa.in.sin_addr.s_addr);
-					break;
 
-				case AF_LINK:
-					switch (ifnet.if_type) {
-					case IFT_ETHER:
-					case IFT_FDDI:
-						fmt = ether_ntoa(
-							(struct ether_addr *)
-							LLADDR(&msa.dl));
-						break;
-					}
-					break;
-				}
-				if (fmt)
-					printf("%23s %s\n", "", fmt);
-			}
-		}
+		if (aflag) 
+			multipr(sa->sa_family, next, lim);
 	}
 }
 
-#define	MAXIF	10
 struct	iftot {
-	char	ift_name[16];		/* interface name */
-	u_int	ift_ip;			/* input packets */
-	u_int	ift_ie;			/* input errors */
-	u_int	ift_op;			/* output packets */
-	u_int	ift_oe;			/* output errors */
-	u_int	ift_co;			/* collisions */
-	u_int	ift_dr;			/* drops */
-	u_int	ift_ib;			/* input bytes */
-	u_int	ift_ob;			/* output bytes */
-} iftot[MAXIF];
+	SLIST_ENTRY(iftot) chain;
+	char		ift_name[16];	/* interface name */
+	u_int64_t	ift_ip;			/* input packets */
+	u_int64_t	ift_ie;			/* input errors */
+	u_int64_t	ift_op;			/* output packets */
+	u_int64_t	ift_oe;			/* output errors */
+	u_int64_t	ift_co;			/* collisions */
+	u_int64_t	ift_dr;			/* drops */
+	u_int64_t	ift_ib;			/* input bytes */
+	u_int64_t	ift_ob;			/* output bytes */
+	u_int64_t	ift_itcp;		/* input tc packets */
+	u_int64_t	ift_itcb;		/* input tc bytes */
+	u_int64_t	ift_otcp;		/* output tc packets */
+	u_int64_t	ift_otcb;		/* output tc bytes */
+};
 
 u_char	signalled;			/* set if alarm goes off "early" */
 
@@ -347,102 +475,227 @@ u_char	signalled;			/* set if alarm goes off "early" */
  * XXX - should be rewritten to use ifmib(4).
  */
 static void
-sidewaysintpr(interval, off)
-	unsigned interval;
-	u_long off;
+sidewaysintpr()
 {
-	struct ifnet ifnet;
-	u_long firstifnet;
-	struct ifnethead ifnethead;
-	register struct iftot *ip, *total;
+	struct iftot *total, *sum, *interesting;
 	register int line;
-	struct iftot *lastif, *sum, *interesting;
-	int oldmask, first;
-	u_long interesting_off;
+	int first;
+	int name[6];
+	size_t len;
+	unsigned int ifcount, i;
+	struct ifmibdata *ifmdall = 0;
+	int interesting_row;
+	sigset_t sigset, oldsigset;
+	struct itimerval timer_interval;
 
-	if (kread(off, (char *)&ifnethead, sizeof ifnethead))
-		return;
-	firstifnet = (u_long)ifnethead.tqh_first;
+	/* Common OID prefix */
+	name[0] = CTL_NET;
+	name[1] = PF_LINK;
+	name[2] = NETLINK_GENERIC;
 
-	lastif = iftot;
-	sum = iftot + MAXIF - 1;
-	total = sum - 1;
-	interesting = NULL;
-	interesting_off = 0;
-	for (off = firstifnet, ip = iftot; off;) {
-		char name[16], tname[16];
+	len = sizeof(int);
+	name[3] = IFMIB_SYSTEM;
+	name[4] = IFMIB_IFCOUNT;
+	if (sysctl(name, 5, &ifcount, &len, 0, 0) == 1)
+		err(1, "sysctl IFMIB_IFCOUNT");
 
-		if (kread(off, (char *)&ifnet, sizeof ifnet))
-			break;
-		if (kread((u_long)ifnet.if_name, tname, 16))
-			break;
-		tname[15] = '\0';
-		snprintf(name, 16, "%s%d", tname, ifnet.if_unit);
-		if (interface && strcmp(name, interface) == 0) {
-			interesting = ip;
-			interesting_off = off;
+	len = ifcount * sizeof(struct ifmibdata);
+	ifmdall = malloc(len);
+	if (ifmdall == 0)
+		err(1, "malloc failed");
+	name[3] = IFMIB_IFALLDATA;
+	name[4] = 0;
+	name[5] = IFDATA_GENERAL;
+	if (sysctl(name, 6, ifmdall, &len, (void *)0, 0) == -1)
+		err(1, "sysctl IFMIB_IFALLDATA");
+	
+	interesting = NULL;
+	interesting_row = 0;
+	for (i = 0; i < ifcount; i++) {
+		struct ifmibdata *ifmd = ifmdall + i;
+	
+		if (interface && strcmp(ifmd->ifmd_name, interface) == 0) {
+			if ((interesting = calloc(ifcount, sizeof(struct iftot))) == NULL)
+				err(1, "malloc failed");
+			interesting_row = i + 1;
+			snprintf(interesting->ift_name, 16, "(%s)", ifmd->ifmd_name);;
 		}
-		snprintf(ip->ift_name, 16, "(%s)", name);;
-		ip++;
-		if (ip >= iftot + MAXIF - 2)
-			break;
-		off = (u_long) ifnet.if_link.tqe_next;
 	}
-	lastif = ip;
+	if ((total = calloc(1, sizeof(struct iftot))) == NULL)
+		err(1, "malloc failed");
+
+	if ((sum = calloc(1, sizeof(struct iftot))) == NULL)
+		err(1, "malloc failed");
 
+	/* create a timer that fires repeatedly every interval seconds */
+	timer_interval.it_value.tv_sec = interval;
+	timer_interval.it_value.tv_usec = 0;
+	timer_interval.it_interval.tv_sec = interval;
+	timer_interval.it_interval.tv_usec = 0;
 	(void)signal(SIGALRM, catchalarm);
 	signalled = NO;
-	(void)alarm(interval);
-	for (ip = iftot; ip < iftot + MAXIF; ip++) {
-		ip->ift_ip = 0;
-		ip->ift_ie = 0;
-		ip->ift_ib = 0;
-		ip->ift_op = 0;
-		ip->ift_oe = 0;
-		ip->ift_ob = 0;
-		ip->ift_co = 0;
-		ip->ift_dr = 0;
-	}
+	(void)setitimer(ITIMER_REAL, &timer_interval, NULL);
 	first = 1;
 banner:
-	printf("%17s %14s %16s", "input",
-	    interesting ? interesting->ift_name : "(Total)", "output");
+	if (prioflag)
+		printf("%37s %14s %16s", "input",
+		    interesting ? interesting->ift_name : "(Total)", "output");
+	else
+		printf("%17s %14s %16s", "input",
+		    interesting ? interesting->ift_name : "(Total)", "output");
 	putchar('\n');
-	printf("%10s %5s %10s %10s %5s %10s %5s",
-	    "packets", "errs", "bytes", "packets", "errs", "bytes", "colls");
+	printf("%10s %5s %10s ", 
+	    "packets", "errs", "bytes");
+	if (prioflag)
+		printf(" %10s %10s", "tcpkts", "tcbytes");
+	printf("%10s %5s %10s %5s",
+	    "packets", "errs", "bytes", "colls");
 	if (dflag)
 		printf(" %5.5s", "drops");
+	if (prioflag)
+		printf(" %10s %10s", "tcpkts", "tcbytes");
 	putchar('\n');
 	fflush(stdout);
 	line = 0;
 loop:
 	if (interesting != NULL) {
-		ip = interesting;
-		if (kread(interesting_off, (char *)&ifnet, sizeof ifnet)) {
-			printf("???\n");
-			exit(1);
-		};
+		struct ifmibdata ifmd;
+		struct ifmibdata_supplemental ifmsupp;
+		
+		len = sizeof(struct ifmibdata);
+		name[3] = IFMIB_IFDATA;
+		name[4] = interesting_row;
+		name[5] = IFDATA_GENERAL;
+		if (sysctl(name, 6, &ifmd, &len, (void *)0, 0) == -1)
+			err(1, "sysctl IFDATA_GENERAL %d", interesting_row);
+
+		if (prioflag) {
+			len = sizeof(struct ifmibdata_supplemental);
+			name[3] = IFMIB_IFDATA;
+			name[4] = interesting_row;
+			name[5] = IFDATA_SUPPLEMENTAL;
+			if (sysctl(name, 6, &ifmsupp, &len, (void *)0, 0) == -1)
+				err(1, "sysctl IFDATA_SUPPLEMENTAL %d", interesting_row);
+		}
 		if (!first) {
-			printf("%10lu %5lu %10lu %10lu %5lu %10lu %5lu",
-				ifnet.if_ipackets - ip->ift_ip,
-				ifnet.if_ierrors - ip->ift_ie,
-				ifnet.if_ibytes - ip->ift_ib,
-				ifnet.if_opackets - ip->ift_op,
-				ifnet.if_oerrors - ip->ift_oe,
-				ifnet.if_obytes - ip->ift_ob,
-				ifnet.if_collisions - ip->ift_co);
+			printf("%10llu %5llu %10llu ",
+				ifmd.ifmd_data.ifi_ipackets - interesting->ift_ip,
+				ifmd.ifmd_data.ifi_ierrors - interesting->ift_ie,
+				ifmd.ifmd_data.ifi_ibytes - interesting->ift_ib);
+			switch (prioflag) {
+				case SO_TC_BK:
+					printf("%10llu %10llu ",
+					    ifmsupp.ifmd_traffic_class.ifi_ibkpackets - interesting->ift_itcp,
+					    ifmsupp.ifmd_traffic_class.ifi_ibkbytes - interesting->ift_itcb);
+					break;
+				case SO_TC_VI:
+					printf("%10llu %10llu ",
+					    ifmsupp.ifmd_traffic_class.ifi_ivipackets - interesting->ift_itcp,
+					    ifmsupp.ifmd_traffic_class.ifi_ivibytes - interesting->ift_itcb);
+					break;
+				case SO_TC_VO:
+					printf("%10llu %10llu ",
+					    ifmsupp.ifmd_traffic_class.ifi_ivopackets - interesting->ift_itcp,
+					    ifmsupp.ifmd_traffic_class.ifi_ivobytes - interesting->ift_itcb);
+					break;
+				default:
+					break;
+			}
+			printf("%10llu %5llu %10llu %5llu",
+				ifmd.ifmd_data.ifi_opackets - interesting->ift_op,
+				ifmd.ifmd_data.ifi_oerrors - interesting->ift_oe,
+				ifmd.ifmd_data.ifi_obytes - interesting->ift_ob,
+				ifmd.ifmd_data.ifi_collisions - interesting->ift_co);
 			if (dflag)
-				printf(" %5u", ifnet.if_snd.ifq_drops - ip->ift_dr);
+				printf(" %5llu", ifmd.ifmd_snd_drops - interesting->ift_dr);
+			switch (prioflag) {
+				case SO_TC_BK:
+					printf(" %10llu %10llu",
+					    ifmsupp.ifmd_traffic_class.ifi_obkpackets - interesting->ift_otcp,
+					    ifmsupp.ifmd_traffic_class.ifi_obkbytes - interesting->ift_otcb);
+					break;
+				case SO_TC_VI:
+					printf(" %10llu %10llu",
+					    ifmsupp.ifmd_traffic_class.ifi_ovipackets - interesting->ift_otcp,
+					    ifmsupp.ifmd_traffic_class.ifi_ovibytes - interesting->ift_otcb);
+					break;
+				case SO_TC_VO:
+					printf(" %10llu %10llu",
+					    ifmsupp.ifmd_traffic_class.ifi_ovopackets - interesting->ift_otcp,
+					    ifmsupp.ifmd_traffic_class.ifi_ovobytes - interesting->ift_otcb);
+					break;
+				default:
+					break;
+			}
+		}
+		interesting->ift_ip = ifmd.ifmd_data.ifi_ipackets;
+		interesting->ift_ie = ifmd.ifmd_data.ifi_ierrors;
+		interesting->ift_ib = ifmd.ifmd_data.ifi_ibytes;
+		interesting->ift_op = ifmd.ifmd_data.ifi_opackets;
+		interesting->ift_oe = ifmd.ifmd_data.ifi_oerrors;
+		interesting->ift_ob = ifmd.ifmd_data.ifi_obytes;
+		interesting->ift_co = ifmd.ifmd_data.ifi_collisions;
+		interesting->ift_dr = ifmd.ifmd_snd_drops;
+		/* private counters */
+		switch (prioflag) {
+			case SO_TC_BK:
+				interesting->ift_itcp = ifmsupp.ifmd_traffic_class.ifi_ibkpackets;
+				interesting->ift_itcb = ifmsupp.ifmd_traffic_class.ifi_ibkbytes;
+				interesting->ift_otcp = ifmsupp.ifmd_traffic_class.ifi_obkpackets;
+				interesting->ift_otcb = ifmsupp.ifmd_traffic_class.ifi_obkbytes;
+				break;
+			case SO_TC_VI:
+				interesting->ift_itcp = ifmsupp.ifmd_traffic_class.ifi_ivipackets;
+				interesting->ift_itcb = ifmsupp.ifmd_traffic_class.ifi_ivibytes;
+				interesting->ift_otcp = ifmsupp.ifmd_traffic_class.ifi_ovipackets;
+				interesting->ift_otcb = ifmsupp.ifmd_traffic_class.ifi_ovibytes;
+				break;
+			case SO_TC_VO:
+				interesting->ift_itcp = ifmsupp.ifmd_traffic_class.ifi_ivopackets;
+				interesting->ift_itcb = ifmsupp.ifmd_traffic_class.ifi_ivobytes;
+				interesting->ift_otcp = ifmsupp.ifmd_traffic_class.ifi_ovopackets;
+				interesting->ift_otcb = ifmsupp.ifmd_traffic_class.ifi_ovobytes;
+				break;
+			default:
+				break;
 		}
-		ip->ift_ip = ifnet.if_ipackets;
-		ip->ift_ie = ifnet.if_ierrors;
-		ip->ift_ib = ifnet.if_ibytes;
-		ip->ift_op = ifnet.if_opackets;
-		ip->ift_oe = ifnet.if_oerrors;
-		ip->ift_ob = ifnet.if_obytes;
-		ip->ift_co = ifnet.if_collisions;
-		ip->ift_dr = ifnet.if_snd.ifq_drops;
 	} else {
+		unsigned int latest_ifcount;
+		struct ifmibdata_supplemental *ifmsuppall = NULL;
+		
+		len = sizeof(int);
+		name[3] = IFMIB_SYSTEM;
+		name[4] = IFMIB_IFCOUNT;
+		if (sysctl(name, 5, &latest_ifcount, &len, 0, 0) == 1)
+			err(1, "sysctl IFMIB_IFCOUNT");
+		if (latest_ifcount > ifcount) {
+			ifcount = latest_ifcount;
+			len = ifcount * sizeof(struct ifmibdata);
+			free(ifmdall);
+			ifmdall = malloc(len);
+			if (ifmdall == 0)
+				err(1, "malloc ifmdall failed");
+		} else if (latest_ifcount > ifcount) {
+			ifcount = latest_ifcount;
+			len = ifcount * sizeof(struct ifmibdata);
+		}
+		len = ifcount * sizeof(struct ifmibdata);
+		name[3] = IFMIB_IFALLDATA;
+		name[4] = 0;
+		name[5] = IFDATA_GENERAL;
+		if (sysctl(name, 6, ifmdall, &len, (void *)0, 0) == -1)
+			err(1, "sysctl IFMIB_IFALLDATA");
+		if (prioflag) {
+			len = ifcount * sizeof(struct ifmibdata_supplemental);
+			ifmsuppall = malloc(len);
+			if (ifmsuppall == NULL)
+				err(1, "malloc ifmsuppall failed");
+			name[3] = IFMIB_IFALLDATA;
+			name[4] = 0;
+			name[5] = IFDATA_SUPPLEMENTAL;
+			if (sysctl(name, 6, ifmsuppall, &len, (void *)0, 0) == -1)
+				err(1, "sysctl IFMIB_IFALLDATA SUPPLEMENTAL");
+		}			
 		sum->ift_ip = 0;
 		sum->ift_ie = 0;
 		sum->ift_ib = 0;
@@ -451,45 +704,84 @@ loop:
 		sum->ift_ob = 0;
 		sum->ift_co = 0;
 		sum->ift_dr = 0;
-		for (off = firstifnet, ip = iftot; off && ip < lastif; ip++) {
-			if (kread(off, (char *)&ifnet, sizeof ifnet)) {
-				off = 0;
-				continue;
+		sum->ift_itcp = 0;
+		sum->ift_itcb = 0;
+		sum->ift_otcp = 0;
+		sum->ift_otcb = 0;
+		for (i = 0; i < ifcount; i++) {
+			struct ifmibdata *ifmd = ifmdall + i;
+			
+			sum->ift_ip += ifmd->ifmd_data.ifi_ipackets;
+			sum->ift_ie += ifmd->ifmd_data.ifi_ierrors;
+			sum->ift_ib += ifmd->ifmd_data.ifi_ibytes;
+			sum->ift_op += ifmd->ifmd_data.ifi_opackets;
+			sum->ift_oe += ifmd->ifmd_data.ifi_oerrors;
+			sum->ift_ob += ifmd->ifmd_data.ifi_obytes;
+			sum->ift_co += ifmd->ifmd_data.ifi_collisions;
+			sum->ift_dr += ifmd->ifmd_snd_drops;
+			/* private counters */
+			if (prioflag) {
+				struct ifmibdata_supplemental *ifmsupp = ifmsuppall + i;
+				switch (prioflag) {
+					case SO_TC_BK:
+						sum->ift_itcp += ifmsupp->ifmd_traffic_class.ifi_ibkpackets;
+						sum->ift_itcb += ifmsupp->ifmd_traffic_class.ifi_ibkbytes;
+						sum->ift_otcp += ifmsupp->ifmd_traffic_class.ifi_obkpackets;
+						sum->ift_otcb += ifmsupp->ifmd_traffic_class.ifi_obkbytes;
+						break;
+					case SO_TC_VI:
+						sum->ift_itcp += ifmsupp->ifmd_traffic_class.ifi_ivipackets;
+						sum->ift_itcb += ifmsupp->ifmd_traffic_class.ifi_ivibytes;
+						sum->ift_otcp += ifmsupp->ifmd_traffic_class.ifi_ovipackets;
+						sum->ift_otcb += ifmsupp->ifmd_traffic_class.ifi_ovibytes;
+						break;
+					case SO_TC_VO:
+						sum->ift_itcp += ifmsupp->ifmd_traffic_class.ifi_ivopackets;
+						sum->ift_itcb += ifmsupp->ifmd_traffic_class.ifi_ivobytes;
+						sum->ift_otcp += ifmsupp->ifmd_traffic_class.ifi_ovopackets;
+						sum->ift_otcb += ifmsupp->ifmd_traffic_class.ifi_ovobytes;
+						break;
+					default:
+						break;
+				}
 			}
-			sum->ift_ip += ifnet.if_ipackets;
-			sum->ift_ie += ifnet.if_ierrors;
-			sum->ift_ib += ifnet.if_ibytes;
-			sum->ift_op += ifnet.if_opackets;
-			sum->ift_oe += ifnet.if_oerrors;
-			sum->ift_ob += ifnet.if_obytes;
-			sum->ift_co += ifnet.if_collisions;
-			sum->ift_dr += ifnet.if_snd.ifq_drops;
-			off = (u_long) ifnet.if_link.tqe_next;
 		}
 		if (!first) {
-			printf("%10u %5u %10u %10u %5u %10u %5u",
+			printf("%10llu %5llu %10llu ",
 				sum->ift_ip - total->ift_ip,
 				sum->ift_ie - total->ift_ie,
-				sum->ift_ib - total->ift_ib,
+				sum->ift_ib - total->ift_ib);
+			if (prioflag)
+				printf(" %10llu %10llu",
+				    sum->ift_itcp - total->ift_itcp,
+				    sum->ift_itcb - total->ift_itcb);
+			printf("%10llu %5llu %10llu %5llu",
 				sum->ift_op - total->ift_op,
 				sum->ift_oe - total->ift_oe,
 				sum->ift_ob - total->ift_ob,
 				sum->ift_co - total->ift_co);
 			if (dflag)
-				printf(" %5u", sum->ift_dr - total->ift_dr);
+				printf(" %5llu", sum->ift_dr - total->ift_dr);
+			if (prioflag)
+				printf(" %10llu %10llu",
+				    sum->ift_otcp - total->ift_otcp,
+				    sum->ift_otcb - total->ift_otcb);
 		}
 		*total = *sum;
 	}
 	if (!first)
 		putchar('\n');
 	fflush(stdout);
-	oldmask = sigblock(sigmask(SIGALRM));
-	if (! signalled) {
-		sigpause(0);
+	sigemptyset(&sigset);
+	sigaddset(&sigset, SIGALRM);
+	(void)sigprocmask(SIG_BLOCK, &sigset, &oldsigset);
+	if (!signalled) {
+	    sigemptyset(&sigset);
+	    sigsuspend(&sigset);
 	}
-	sigsetmask(oldmask);
+	(void)sigprocmask(SIG_SETMASK, &oldsigset, NULL);
+
 	signalled = NO;
-	(void)alarm(interval);
 	line++;
 	first = 0;
 	if (line == 21)
@@ -499,13 +791,43 @@ loop:
 	/*NOTREACHED*/
 }
 
+void
+intervalpr(void (*pr)(uint32_t, char *, int), uint32_t off, char *name , int af)
+{
+	struct itimerval timer_interval;
+	sigset_t sigset, oldsigset;
+
+	/* create a timer that fires repeatedly every interval seconds */
+	timer_interval.it_value.tv_sec = interval;
+	timer_interval.it_value.tv_usec = 0;
+	timer_interval.it_interval.tv_sec = interval;
+	timer_interval.it_interval.tv_usec = 0;
+	(void) signal(SIGALRM, catchalarm);
+	signalled = NO;
+	(void) setitimer(ITIMER_REAL, &timer_interval, NULL);
+
+	for (;;) {
+		pr(off, name, af);
+
+		fflush(stdout);
+		sigemptyset(&sigset);
+		sigaddset(&sigset, SIGALRM);
+		(void) sigprocmask(SIG_BLOCK, &sigset, &oldsigset);
+		if (!signalled) {
+			sigemptyset(&sigset);
+			sigsuspend(&sigset);
+		}
+		(void) sigprocmask(SIG_SETMASK, &oldsigset, NULL);
+		signalled = NO;
+	}
+}
+
 /*
  * Called if an interval expires before sidewaysintpr has completed a loop.
  * Sets a flag to not wait for the alarm.
  */
 static void
-catchalarm(signo)
-	int signo;
+catchalarm(int signo )
 {
 	signalled = YES;
 }