diff options
Diffstat (limited to 'usr.bin/netstat')
| -rw-r--r-- | usr.bin/netstat/inet.c | 5 | ||||
| -rw-r--r-- | usr.bin/netstat/unix.c | 23 |
2 files changed, 15 insertions, 13 deletions
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index 3cf673b2ca9..077b922465b 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.122 2013/03/20 15:23:37 deraadt Exp $ */ +/* $OpenBSD: inet.c,v 1.123 2013/04/18 15:43:22 deraadt Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -1175,6 +1175,7 @@ socket_dump(u_long off) kread(off, &so, sizeof(so)); #define p(fmt, v, sep) printf(#v " " fmt sep, so.v); +#define pll(fmt, v, sep) printf(#v " " fmt sep, (long long) so.v); #define pp(fmt, v, sep) printf(#v " " fmt sep, hideroot ? 0 : so.v); printf("socket %#lx\n ", hideroot ? 0 : off); p("%#0.4x", so_type, "\n "); @@ -1197,7 +1198,7 @@ socket_dump(u_long off) pp("%p", so_spliceback, "\n "); p("%lld", so_splicelen, ", "); p("%lld", so_splicemax, ", "); - p("%ld", so_idletv.tv_sec, ", "); + pll("%lld", so_idletv.tv_sec, ", "); p("%ld", so_idletv.tv_usec, "\n "); sockbuf_dump(&so.so_rcv, "so_rcv"); sockbuf_dump(&so.so_snd, "so_snd"); diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c index 2a4885feabf..1f4c75cd164 100644 --- a/usr.bin/netstat/unix.c +++ b/usr.bin/netstat/unix.c @@ -1,4 +1,4 @@ -/* $OpenBSD: unix.c,v 1.17 2013/04/16 22:19:14 deraadt Exp $ */ +/* $OpenBSD: unix.c,v 1.18 2013/04/18 15:43:22 deraadt Exp $ */ /* $NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $ */ /*- @@ -147,24 +147,25 @@ unpcb_dump(u_long off) return; kread(off, &unp, sizeof(unp)); -#define p(fmt, cast, v, sep) printf(#v " " fmt sep, cast unp.v); +#define p(fmt, v, sep) printf(#v " " fmt sep, unp.v); +#define pll(fmt, v, sep) printf(#v " " fmt sep, (long long) unp.v); #define pp(fmt, v, sep) printf(#v " " fmt sep, hideroot ? 0 : unp.v); printf("unpcb %#lx\n ", hideroot ? 0 : off); pp("%p", unp_socket, "\n "); pp("%p", unp_vnode, ", "); - p("%u", , unp_ino, "\n "); + p("%u", unp_ino, "\n "); pp("%p", unp_conn, ", "); pp("%p", unp_refs, ", "); pp("%p", unp_nextref, "\n "); pp("%p", unp_addr, "\n "); - p("%#0.8x", , unp_flags, "\n "); - p("%u", , unp_connid.uid, ", "); - p("%u", , unp_connid.gid, ", "); - p("%d", , unp_connid.pid, "\n "); - p("%d", , unp_cc, ", "); - p("%d", , unp_mbcnt, "\n "); - p("%lld", (long long), unp_ctime.tv_sec, ", "); - p("%ld", , unp_ctime.tv_nsec, "\n"); + p("%#0.8x", unp_flags, "\n "); + p("%u", unp_connid.uid, ", "); + p("%u", unp_connid.gid, ", "); + p("%d", unp_connid.pid, "\n "); + p("%d", unp_cc, ", "); + p("%d", unp_mbcnt, "\n "); + pll("%lld", unp_ctime.tv_sec, ", "); + p("%ld", unp_ctime.tv_nsec, "\n"); #undef p #undef pp } |