=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/inet.c,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- src/usr.bin/netstat/inet.c 2016/08/13 17:36:04 1.148 +++ src/usr.bin/netstat/inet.c 2016/08/13 17:51:25 1.149 @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.148 2016/08/13 17:36:04 krw Exp $ */ +/* $OpenBSD: inet.c,v 1.149 2016/08/13 17:51:25 krw Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -378,10 +378,10 @@ p(tcps_sndtotal, "\t%u packet%s sent\n"); p2(tcps_sndpack,tcps_sndbyte, - "\t\t%u data packet%s (%lld byte%s)\n"); + "\t\t%u data packet%s (%llu byte%s)\n"); p2(tcps_sndrexmitpack, tcps_sndrexmitbyte, - "\t\t%u data packet%s (%lld byte%s) retransmitted\n"); - p(tcps_sndrexmitfast, "\t\t%lld fast retransmitted packet%s\n"); + "\t\t%u data packet%s (%llu byte%s) retransmitted\n"); + p(tcps_sndrexmitfast, "\t\t%llu fast retransmitted packet%s\n"); p2a(tcps_sndacks, tcps_delack, "\t\t%u ack-only packet%s (%u delayed)\n"); p(tcps_sndurg, "\t\t%u URG only packet%s\n"); @@ -390,21 +390,21 @@ p(tcps_sndctrl, "\t\t%u control packet%s\n"); p(tcps_outswcsum, "\t\t%u packet%s software-checksummed\n"); p(tcps_rcvtotal, "\t%u packet%s received\n"); - p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%u ack%s (for %lld byte%s)\n"); + p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%u ack%s (for %llu byte%s)\n"); p(tcps_rcvdupack, "\t\t%u duplicate ack%s\n"); p(tcps_rcvacktoomuch, "\t\t%u ack%s for unsent data\n"); p(tcps_rcvacktooold, "\t\t%u ack%s for old data\n"); p2(tcps_rcvpack, tcps_rcvbyte, "\t\t%u packet%s (%llu byte%s) received in-sequence\n"); p2(tcps_rcvduppack, tcps_rcvdupbyte, - "\t\t%u completely duplicate packet%s (%lld byte%s)\n"); + "\t\t%u completely duplicate packet%s (%llu byte%s)\n"); p(tcps_pawsdrop, "\t\t%u old duplicate packet%s\n"); p2(tcps_rcvpartduppack, tcps_rcvpartdupbyte, - "\t\t%u packet%s with some duplicate data (%lld byte%s duplicated)\n"); + "\t\t%u packet%s with some duplicate data (%llu byte%s duplicated)\n"); p2(tcps_rcvoopack, tcps_rcvoobyte, - "\t\t%u out-of-order packet%s (%lld byte%s)\n"); + "\t\t%u out-of-order packet%s (%llu byte%s)\n"); p2(tcps_rcvpackafterwin, tcps_rcvbyteafterwin, - "\t\t%u packet%s (%lld byte%s) of data after window\n"); + "\t\t%u packet%s (%llu byte%s) of data after window\n"); p(tcps_rcvwinprobe, "\t\t%u window probe%s\n"); p(tcps_rcvwinupd, "\t\t%u window update packet%s\n"); p(tcps_rcvafterclose, "\t\t%u packet%s received after close\n"); @@ -415,13 +415,13 @@ p1(tcps_rcvmemdrop, "\t\t%u discarded due to memory shortage\n"); p(tcps_inswcsum, "\t\t%u packet%s software-checksummed\n"); p(tcps_rcvbadsig, "\t\t%u bad/missing md5 checksum%s\n"); - p(tcps_rcvgoodsig, "\t\t%lld good md5 checksum%s\n"); + p(tcps_rcvgoodsig, "\t\t%llu good md5 checksum%s\n"); p(tcps_connattempt, "\t%u connection request%s\n"); p(tcps_accepts, "\t%u connection accept%s\n"); p(tcps_connects, "\t%u connection%s established (including accepts)\n"); p2(tcps_closed, tcps_drops, "\t%u connection%s closed (including %u drop%s)\n"); - p(tcps_conndrained, "\t%lld connection%s drained\n"); + p(tcps_conndrained, "\t%llu connection%s drained\n"); p(tcps_conndrops, "\t%u embryonic connection%s dropped\n"); p2(tcps_rttupdated, tcps_segstimed, "\t%u segment%s updated rtt (of %u attempt%s)\n"); @@ -449,36 +449,36 @@ p(tcps_badsyn, "\t%u bad connection attempt%s\n"); p(tcps_dropsyn, "\t%u SYN packet%s dropped due to queue or memory full\n"); - pys(tcps_sc_added, "\t%lld SYN cache entr%s added\n"); - p(tcps_sc_collisions, "\t\t%lld hash collision%s\n"); - p1(tcps_sc_completed, "\t\t%lld completed\n"); - p1(tcps_sc_aborted, "\t\t%lld aborted (no space to build PCB)\n"); - p1(tcps_sc_timed_out, "\t\t%lld timed out\n"); - p1(tcps_sc_overflowed, "\t\t%lld dropped due to overflow\n"); - p1(tcps_sc_bucketoverflow, "\t\t%lld dropped due to bucket overflow\n"); - p1(tcps_sc_reset, "\t\t%lld dropped due to RST\n"); - p1(tcps_sc_unreach, "\t\t%lld dropped due to ICMP unreachable\n"); - p(tcps_sc_retransmitted, "\t%lld SYN,ACK%s retransmitted\n"); - p(tcps_sc_dupesyn, "\t%lld duplicate SYN%s received for entries " + pys(tcps_sc_added, "\t%llu SYN cache entr%s added\n"); + p(tcps_sc_collisions, "\t\t%llu hash collision%s\n"); + p1(tcps_sc_completed, "\t\t%llu completed\n"); + p1(tcps_sc_aborted, "\t\t%llu aborted (no space to build PCB)\n"); + p1(tcps_sc_timed_out, "\t\t%llu timed out\n"); + p1(tcps_sc_overflowed, "\t\t%llu dropped due to overflow\n"); + p1(tcps_sc_bucketoverflow, "\t\t%llu dropped due to bucket overflow\n"); + p1(tcps_sc_reset, "\t\t%llu dropped due to RST\n"); + p1(tcps_sc_unreach, "\t\t%llu dropped due to ICMP unreachable\n"); + p(tcps_sc_retransmitted, "\t%llu SYN,ACK%s retransmitted\n"); + p(tcps_sc_dupesyn, "\t%llu duplicate SYN%s received for entries " "already in the cache\n"); - p(tcps_sc_dropped, "\t%lld SYN%s dropped (no route or no space)\n"); - p(tcps_sc_seedrandom, "\t%lld SYN cache seed%s with new random\n"); - p1(tcps_sc_hash_size, "\t%lld hash bucket array size in current " + p(tcps_sc_dropped, "\t%llu SYN%s dropped (no route or no space)\n"); + p(tcps_sc_seedrandom, "\t%llu SYN cache seed%s with new random\n"); + p1(tcps_sc_hash_size, "\t%llu hash bucket array size in current " "SYN cache\n"); p2bys(tcps_sc_entry_count, tcps_sc_entry_limit, - "\t%lld entr%s in current SYN cache, limit is %lld\n"); + "\t%llu entr%s in current SYN cache, limit is %llu\n"); p2b(tcps_sc_bucket_maxlen, tcps_sc_bucket_limit, - "\t%lld longest bucket length in current SYN cache, limit is %lld\n"); - p(tcps_sc_uses_left, "\t%lld use%s of current SYN cache left\n"); + "\t%llu longest bucket length in current SYN cache, limit is %llu\n"); + p(tcps_sc_uses_left, "\t%llu use%s of current SYN cache left\n"); - p(tcps_sack_recovery_episode, "\t%lld SACK recovery episode%s\n"); + p(tcps_sack_recovery_episode, "\t%llu SACK recovery episode%s\n"); p(tcps_sack_rexmits, - "\t\t%lld segment rexmit%s in SACK recovery episodes\n"); + "\t\t%llu segment rexmit%s in SACK recovery episodes\n"); p(tcps_sack_rexmit_bytes, - "\t\t%lld byte rexmit%s in SACK recovery episodes\n"); + "\t\t%llu byte rexmit%s in SACK recovery episodes\n"); p(tcps_sack_rcv_opts, - "\t%lld SACK option%s received\n"); - p(tcps_sack_snd_opts, "\t%lld SACK option%s sent\n"); + "\t%llu SACK option%s received\n"); + p(tcps_sack_snd_opts, "\t%llu SACK option%s sent\n"); #undef p #undef p1