=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/if.c,v retrieving revision 1.51 retrieving revision 1.52 diff -c -r1.51 -r1.52 *** src/usr.bin/netstat/if.c 2007/06/15 01:25:05 1.51 --- src/usr.bin/netstat/if.c 2007/09/05 20:27:04 1.52 *************** *** 1,4 **** ! /* $OpenBSD: if.c,v 1.51 2007/06/15 01:25:05 ray Exp $ */ /* $NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $ */ /* --- 1,4 ---- ! /* $OpenBSD: if.c,v 1.52 2007/09/05 20:27:04 claudio Exp $ */ /* $NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $ */ /* *************** *** 34,40 **** #if 0 static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94"; #else ! static char *rcsid = "$OpenBSD: if.c,v 1.51 2007/06/15 01:25:05 ray Exp $"; #endif #endif /* not lint */ --- 34,40 ---- #if 0 static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94"; #else ! static char *rcsid = "$OpenBSD: if.c,v 1.52 2007/09/05 20:27:04 claudio Exp $"; #endif #endif /* not lint */ *************** *** 81,87 **** struct in6_ifaddr in6; #endif } ifaddr; ! u_long total, ifaddraddr; struct sockaddr *sa; struct ifnet_head ifhead; /* TAILQ_HEAD */ char name[IFNAMSIZ]; --- 81,88 ---- struct in6_ifaddr in6; #endif } ifaddr; ! u_int64_t total; ! u_long ifaddraddr; struct sockaddr *sa; struct ifnet_head ifhead; /* TAILQ_HEAD */ char name[IFNAMSIZ]; *************** *** 310,319 **** ifaddraddr = (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_list); } if (bflag) ! printf("%10lu %10lu", ifnet.if_ibytes, ifnet.if_obytes); else ! printf("%8lu %5lu %8lu %5lu %5lu", ifnet.if_ipackets, ifnet.if_ierrors, ifnet.if_opackets, ifnet.if_oerrors, ifnet.if_collisions); --- 311,320 ---- ifaddraddr = (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_list); } if (bflag) ! printf("%10llu %10llu", ifnet.if_ibytes, ifnet.if_obytes); else ! printf("%8llu %5llu %8llu %5llu %5llu", ifnet.if_ipackets, ifnet.if_ierrors, ifnet.if_opackets, ifnet.if_oerrors, ifnet.if_collisions);