static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95";
*/
static const char rcsid[] =
- "$Id: if.c,v 1.2 2002/03/05 20:35:13 lindak Exp $";
+ "$Id: if.c,v 1.6 2005/01/25 00:10:05 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_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>
#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 (u_int, u_long);
+#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(u_long)) : \
+ sizeof(u_long)))
+
+static void sidewaysintpr ();
static void catchalarm (int);
#ifdef INET6
-char *netname6 (struct sockaddr_in6 *, struct in6_addr *);
+char *netname6 (struct sockaddr_in6 *, struct sockaddr *);
static char ntop_buf[INET6_ADDRSTRLEN]; /* for inet_ntop() */
-static int bdg_done;
#endif
#if 0
+#ifdef INET6
+static int bdg_done;
+#endif
+
/* print bridge statistics */
void
bdg_stats(u_long dummy , char *name, int af )
* Display a formatted value, or a '-' in the same space.
*/
static void
-show_stat(const char *fmt, int width, u_long value, short showvalue)
+show_stat(const char *fmt, int width, u_int64_t value, short showvalue)
{
char newfmt[32];
}
}
+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 = (struct sockaddr_in6 *)sa;
+
+ 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(int interval, u_long ifnetaddr, void (*pfunc)(char *))
+intpr(void (*pfunc)(char *))
{
- struct ifnet ifnet;
- struct ifnethead ifnethead;
- union {
- struct ifaddr ifa;
- struct in_ifaddr in;
-#ifdef INET6
- struct in6_ifaddr in6;
-#endif
-#if 0
- 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;
- u_long opackets;
- u_long ipackets;
- u_long obytes;
- u_long ibytes;
- u_long oerrors;
- u_long ierrors;
- u_long collisions;
- short timer;
- int drops;
+ 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;
+ u_long mtu = 0;
+ short timer = 0;
+ int drops = 0;
struct sockaddr *sa = NULL;
- char name[32], tname[16];
+ char name[32];
short network_layer;
short link_layer;
-
- if (ifnetaddr == 0) {
- printf("ifnet: symbol not defined\n");
- return;
- }
+ 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)TAILQ_FIRST(&ifnethead);
- 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;
-
+ }
if (!pfunc) {
printf("%-5.5s %-5.5s %-13.13s %-15.15s %8.8s %5.5s",
"Name", "Mtu", "Network", "Address", "Ipkts", "Ierrs");
printf(" %s", "Drop");
putchar('\n');
}
- ifaddraddr = 0;
- while (ifnetaddr || ifaddraddr) {
- struct sockaddr_in *sin;
-#ifdef INET6
- struct sockaddr_in6 *sin6;
-#endif
- register char *cp;
+ 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)TAILQ_NEXT(&ifnet, if_link);
- 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');
continue;
}
- if ((ifnet.if_flags&IFF_UP) == 0)
+ if ((if2m->ifm_flags & IFF_UP) == 0)
*cp++ = '*';
*cp = '\0';
- ifaddraddr = (u_long)TAILQ_FIRST(&ifnet.if_addrhead);
- }
- printf("%-5.5s %-5lu ", name, ifnet.if_mtu);
- ifaddrfound = ifaddraddr;
-
- /*
- * Get the interface stats. These may get
- * overriden below on a per-interface basis.
- */
- opackets = ifnet.if_opackets;
- ipackets = ifnet.if_ipackets;
- obytes = ifnet.if_obytes;
- ibytes = ifnet.if_ibytes;
- oerrors = ifnet.if_oerrors;
- ierrors = ifnet.if_ierrors;
- collisions = ifnet.if_collisions;
- timer = ifnet.if_timer;
- drops = ifnet.if_snd.ifq_drops;
-
- if (ifaddraddr == 0) {
+
+ /*
+ * 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, 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
- printf("%-13.13s ",
- netname(htonl(ifaddr.in.ia_subnet),
- ifaddr.in.ia_subnetmask));
-#endif
+ 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(sin->sin_addr.s_addr & mask.sin_addr.s_addr,
+ mask.sin_addr.s_addr));
+
printf("%-15.15s ",
routename(sin->sin_addr.s_addr));
network_layer = 1;
break;
+ }
#ifdef INET6
- case AF_INET6:
- sin6 = (struct sockaddr_in6 *)sa;
+ case AF_INET6: {
+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa;
+ struct sockaddr *mask = (struct sockaddr *)rti_info[RTAX_NETMASK];
+
printf("%-11.11s ",
- netname6(&ifaddr.in6.ia_addr,
- &ifaddr.in6.ia_prefixmask.sin6_addr));
+ netname6(sin6,
+ mask));
printf("%-17.17s ",
(char *)inet_ntop(AF_INET6,
&sin6->sin6_addr,
network_layer = 1;
break;
+ }
#endif /*INET6*/
-#if 0
- 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;
-
- 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));
- }
- break;
-#endif
case AF_LINK:
{
struct sockaddr_dl *sdl =
ibytes = ifaddr.in.ia_ifa.if_ibytes;
}
#endif
- ifaddraddr = (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_link);
}
- show_stat("lu", 8, ipackets, link_layer|network_layer);
+ show_stat("llu", 8, ipackets, link_layer|network_layer);
printf(" ");
- show_stat("lu", 5, ierrors, link_layer);
+ show_stat("llu", 5, ierrors, link_layer);
printf(" ");
if (bflag) {
- show_stat("lu", 10, ibytes, link_layer|network_layer);
+ show_stat("llu", 10, ibytes, link_layer|network_layer);
printf(" ");
}
- show_stat("lu", 8, opackets, link_layer|network_layer);
+ show_stat("llu", 8, opackets, link_layer|network_layer);
printf(" ");
- show_stat("lu", 5, oerrors, link_layer);
+ show_stat("llu", 5, oerrors, link_layer);
printf(" ");
if (bflag) {
- show_stat("lu", 10, obytes, link_layer|network_layer);
+ show_stat("llu", 10, obytes, link_layer|network_layer);
printf(" ");
}
- show_stat("lu", 5, collisions, link_layer);
+ show_stat("llu", 5, collisions, link_layer);
if (tflag) {
printf(" ");
- show_stat("d", 3, timer, link_layer);
+ show_stat("ll", 3, timer, link_layer);
}
if (dflag) {
printf(" ");
- show_stat("d", 3, drops, link_layer);
+ show_stat("ll", 3, drops, link_layer);
}
putchar('\n');
- if (aflag && ifaddrfound) {
- /*
- * Print family's multicast addresses
- */
- u_long multiaddr;
- struct ifmultiaddr ifma;
- union {
- struct sockaddr sa;
- struct sockaddr_in in;
-#ifdef INET6
- struct sockaddr_in6 in6;
-#endif /* INET6 */
- 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;
-#ifdef INET6
- case AF_INET6:
- printf("%23s %-19.19s(refs: %d)\n", "",
- inet_ntop(AF_INET6,
- &msa.in6.sin6_addr,
- ntop_buf,
- sizeof(ntop_buf)),
- ifma.ifma_refcount);
- break;
-#endif /* INET6 */
- case AF_LINK:
- switch (msa.dl.sdl_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);
}
}
struct iftot {
SLIST_ENTRY(iftot) chain;
- char ift_name[16]; /* interface name */
- u_long ift_ip; /* input packets */
- u_long ift_ie; /* input errors */
- u_long ift_op; /* output packets */
- u_long ift_oe; /* output errors */
- u_long ift_co; /* collisions */
- u_int ift_dr; /* drops */
- u_long ift_ib; /* input bytes */
- u_long ift_ob; /* output bytes */
+ 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_char signalled; /* set if alarm goes off "early" */
* XXX - should be rewritten to use ifmib(4).
*/
static void
-sidewaysintpr(unsigned interval, u_long off)
+sidewaysintpr()
{
- struct ifnet ifnet;
- u_long firstifnet;
- struct ifnethead ifnethead;
- struct iftot *iftot, *ip, *ipn, *total, *sum, *interesting;
+ struct iftot *total, *sum, *interesting;
register int line;
int oldmask, first;
- u_long interesting_off;
-
- if (kread(off, (char *)&ifnethead, sizeof ifnethead))
- return;
- firstifnet = (u_long)TAILQ_FIRST(&ifnethead);
-
- if ((iftot = malloc(sizeof(struct iftot))) == NULL) {
- printf("malloc failed\n");
- exit(1);
- }
- memset(iftot, 0, sizeof(struct iftot));
-
+ int name[6];
+ size_t len;
+ unsigned int ifcount, i;
+ struct ifmibdata *ifmdall = 0;
+ int interesting_row;
+
+ /* Common OID prefix */
+ name[0] = CTL_NET;
+ name[1] = PF_LINK;
+ name[2] = NETLINK_GENERIC;
+
+ 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");
+
+ 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_off = 0;
- for (off = firstifnet, ip = iftot; off;) {
- char name[16], tname[16];
-
- 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;
- }
- snprintf(ip->ift_name, 16, "(%s)", name);;
- if ((ipn = malloc(sizeof(struct iftot))) == NULL) {
- printf("malloc failed\n");
- exit(1);
+ 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);;
}
- memset(ipn, 0, sizeof(struct iftot));
- SLIST_NEXT(ip, chain) = ipn;
- ip = ipn;
- off = (u_long)TAILQ_NEXT(&ifnet, if_link);
}
- if ((total = malloc(sizeof(struct iftot))) == NULL) {
- printf("malloc failed\n");
- exit(1);
- }
- memset(total, 0, sizeof(struct iftot));
- if ((sum = malloc(sizeof(struct iftot))) == NULL) {
- printf("malloc failed\n");
- exit(1);
- }
- memset(sum, 0, sizeof(struct iftot));
+ if ((total = calloc(1, sizeof(struct iftot))) == NULL)
+ err(1, "malloc failed");
+
+ if ((sum = calloc(1, sizeof(struct iftot))) == NULL)
+ err(1, "malloc failed");
(void)signal(SIGALRM, catchalarm);
line = 0;
loop:
if (interesting != NULL) {
- ip = interesting;
- if (kread(interesting_off, (char *)&ifnet, sizeof ifnet)) {
- printf("???\n");
- exit(1);
- };
+ struct ifmibdata ifmd;
+
+ 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 (!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 %10llu %5llu %10llu %5llu",
+ ifmd.ifmd_data.ifi_ipackets - interesting->ift_ip,
+ ifmd.ifmd_data.ifi_ierrors - interesting->ift_ie,
+ ifmd.ifmd_data.ifi_ibytes - interesting->ift_ib,
+ 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);
}
- 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;
+ 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;
} else {
+ unsigned int latest_ifcount;
+
+ 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 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");
+
sum->ift_ip = 0;
sum->ift_ie = 0;
sum->ift_ib = 0;
sum->ift_ob = 0;
sum->ift_co = 0;
sum->ift_dr = 0;
- for (off = firstifnet, ip = iftot;
- off && SLIST_NEXT(ip, chain) != NULL;
- ip = SLIST_NEXT(ip, chain)) {
- if (kread(off, (char *)&ifnet, sizeof ifnet)) {
- off = 0;
- continue;
- }
- 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)TAILQ_NEXT(&ifnet, if_link);
+ 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;
}
if (!first) {
- printf("%10lu %5lu %10lu %10lu %5lu %10lu %5lu",
+ printf("%10llu %5llu %10llu %10llu %5llu %10llu %5llu",
sum->ift_ip - total->ift_ip,
sum->ift_ie - total->ift_ie,
sum->ift_ib - total->ift_ib,
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);
}
*total = *sum;
}
projects / apple / network_cmds.git / blobdiff