diff options
| -rw-r--r-- | sys/netinet/tcp_var.h | 18 | ||||
| -rw-r--r-- | usr.bin/netstat/inet.c | 20 |
2 files changed, 19 insertions, 19 deletions
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 4af16304c3a..038c363b5b4 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_var.h,v 1.6 1997/06/06 11:22:18 deraadt Exp $ */ +/* $OpenBSD: tcp_var.h,v 1.7 1997/06/15 13:47:28 deraadt Exp $ */ /* $NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $ */ /* @@ -188,9 +188,9 @@ struct tcpstat { u_long tcps_sndtotal; /* total packets sent */ u_long tcps_sndpack; /* data packets sent */ - u_long tcps_sndbyte; /* data bytes sent */ + u_quad_t tcps_sndbyte; /* data bytes sent */ u_long tcps_sndrexmitpack; /* data packets retransmitted */ - u_long tcps_sndrexmitbyte; /* data bytes retransmitted */ + u_quad_t tcps_sndrexmitbyte; /* data bytes retransmitted */ u_long tcps_sndacks; /* ack-only packets sent */ u_long tcps_sndprobe; /* window probes sent */ u_long tcps_sndurg; /* packets sent with URG only */ @@ -199,25 +199,25 @@ struct tcpstat { u_long tcps_rcvtotal; /* total packets received */ u_long tcps_rcvpack; /* packets received in sequence */ - u_long tcps_rcvbyte; /* bytes received in sequence */ + u_quad_t tcps_rcvbyte; /* bytes received in sequence */ u_long tcps_rcvbadsum; /* packets received with ccksum errs */ u_long tcps_rcvbadoff; /* packets received with bad offset */ u_long tcps_rcvmemdrop; /* packets dropped for lack of memory */ u_long tcps_rcvshort; /* packets received too short */ u_long tcps_rcvduppack; /* duplicate-only packets received */ - u_long tcps_rcvdupbyte; /* duplicate-only bytes received */ + u_quad_t tcps_rcvdupbyte; /* duplicate-only bytes received */ u_long tcps_rcvpartduppack; /* packets with some duplicate data */ - u_long tcps_rcvpartdupbyte; /* dup. bytes in part-dup. packets */ + u_quad_t tcps_rcvpartdupbyte; /* dup. bytes in part-dup. packets */ u_long tcps_rcvoopack; /* out-of-order packets received */ - u_long tcps_rcvoobyte; /* out-of-order bytes received */ + u_quad_t tcps_rcvoobyte; /* out-of-order bytes received */ u_long tcps_rcvpackafterwin; /* packets with data after window */ - u_long tcps_rcvbyteafterwin; /* bytes rcvd after window */ + u_quad_t tcps_rcvbyteafterwin; /* bytes rcvd after window */ u_long tcps_rcvafterclose; /* packets rcvd after "close" */ u_long tcps_rcvwinprobe; /* rcvd window probe packets */ u_long tcps_rcvdupack; /* rcvd duplicate acks */ u_long tcps_rcvacktoomuch; /* rcvd acks for unsent data */ u_long tcps_rcvackpack; /* rcvd ack packets */ - u_long tcps_rcvackbyte; /* bytes acked by rcvd acks */ + u_quad_t tcps_rcvackbyte; /* bytes acked by rcvd acks */ u_long tcps_rcvwinupd; /* rcvd window update packets */ u_long tcps_pawsdrop; /* segments dropped due to PAWS */ u_long tcps_predack; /* times hdr predict ok for acks */ diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index f1460e01a72..1e28b1e0d18 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.12 1997/02/27 01:48:26 angelos Exp $ */ +/* $OpenBSD: inet.c,v 1.13 1997/06/15 13:47:27 deraadt Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -static char *rcsid = "$OpenBSD: inet.c,v 1.12 1997/02/27 01:48:26 angelos Exp $"; +static char *rcsid = "$OpenBSD: inet.c,v 1.13 1997/06/15 13:47:27 deraadt Exp $"; #endif #endif /* not lint */ @@ -189,9 +189,9 @@ tcp_stats(off, name) p(tcps_sndtotal, "\t%d packet%s sent\n"); p2(tcps_sndpack,tcps_sndbyte, - "\t\t%d data packet%s (%d byte%s)\n"); + "\t\t%d data packet%s (%qd byte%s)\n"); p2(tcps_sndrexmitpack, tcps_sndrexmitbyte, - "\t\t%d data packet%s (%d byte%s) retransmitted\n"); + "\t\t%d data packet%s (%qd byte%s) retransmitted\n"); p2(tcps_sndacks, tcps_delack, "\t\t%d ack-only packet%s (%d delayed)\n"); p(tcps_sndurg, "\t\t%d URG only packet%s\n"); @@ -199,20 +199,20 @@ tcp_stats(off, name) p(tcps_sndwinup, "\t\t%d window update packet%s\n"); p(tcps_sndctrl, "\t\t%d control packet%s\n"); p(tcps_rcvtotal, "\t%d packet%s received\n"); - p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%d ack%s (for %d byte%s)\n"); + p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%d ack%s (for %qd byte%s)\n"); p(tcps_rcvdupack, "\t\t%d duplicate ack%s\n"); p(tcps_rcvacktoomuch, "\t\t%d ack%s for unsent data\n"); p2(tcps_rcvpack, tcps_rcvbyte, - "\t\t%d packet%s (%d byte%s) received in-sequence\n"); + "\t\t%d packet%s (%qd byte%s) received in-sequence\n"); p2(tcps_rcvduppack, tcps_rcvdupbyte, - "\t\t%d completely duplicate packet%s (%d byte%s)\n"); + "\t\t%d completely duplicate packet%s (%qd byte%s)\n"); p(tcps_pawsdrop, "\t\t%d old duplicate packet%s\n"); p2(tcps_rcvpartduppack, tcps_rcvpartdupbyte, - "\t\t%d packet%s with some dup. data (%d byte%s duped)\n"); + "\t\t%d packet%s with some dup. data (%qd byte%s duped)\n"); p2(tcps_rcvoopack, tcps_rcvoobyte, - "\t\t%d out-of-order packet%s (%d byte%s)\n"); + "\t\t%d out-of-order packet%s (%qd byte%s)\n"); p2(tcps_rcvpackafterwin, tcps_rcvbyteafterwin, - "\t\t%d packet%s (%d byte%s) of data after window\n"); + "\t\t%d packet%s (%qd byte%s) of data after window\n"); p(tcps_rcvwinprobe, "\t\t%d window probe%s\n"); p(tcps_rcvwinupd, "\t\t%d window update packet%s\n"); p(tcps_rcvafterclose, "\t\t%d packet%s received after close\n"); |