e0bf701
diff -urN net-tools-1.60/statistics.c net-tools-1.60-patch/statistics.c
e0bf701
--- net-tools-1.60/statistics.c	2001-02-02 10:01:23.000000000 -0800
e0bf701
+++ net-tools-1.60-patch/statistics.c	2004-06-15 11:09:44.000000000 -0700
e0bf701
@@ -63,54 +63,54 @@
e0bf701
 struct entry Iptab[] =
e0bf701
 {
e0bf701
     {"Forwarding", N_("Forwarding is %s"), i_forward | I_STATIC},
e0bf701
-    {"DefaultTTL", N_("Default TTL is %u"), number | I_STATIC},
e0bf701
-    {"InReceives", N_("%u total packets received"), number},
e0bf701
-    {"InHdrErrors", N_("%u with invalid headers"), opt_number},
e0bf701
-    {"InAddrErrors", N_("%u with invalid addresses"), opt_number},
e0bf701
-    {"ForwDatagrams", N_("%u forwarded"), number},
e0bf701
-    {"InUnknownProtos", N_("%u with unknown protocol"), opt_number},
e0bf701
-    {"InDiscards", N_("%u incoming packets discarded"), number},
e0bf701
-    {"InDelivers", N_("%u incoming packets delivered"), number},
e0bf701
-    {"OutRequests", N_("%u requests sent out"), number},	/*? */
e0bf701
-    {"OutDiscards", N_("%u outgoing packets dropped"), opt_number},
e0bf701
-    {"OutNoRoutes", N_("%u dropped because of missing route"), opt_number},
e0bf701
-    {"ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number},
e0bf701
-    {"ReasmReqds", N_("%u reassemblies required"), opt_number},	/* ? */
e0bf701
-    {"ReasmOKs", N_("%u packets reassembled ok"), opt_number},
e0bf701
-    {"ReasmFails", N_("%u packet reassembles failed"), opt_number},
e0bf701
-    {"FragOKs", N_("%u fragments received ok"), opt_number},
e0bf701
-    {"FragFails", N_("%u fragments failed"), opt_number},
e0bf701
-    {"FragCreates", N_("%u fragments created"), opt_number}
e0bf701
+    {"DefaultTTL", N_("Default TTL is %lu"), number | I_STATIC},
e0bf701
+    {"InReceives", N_("%lu total packets received"), number},
e0bf701
+    {"InHdrErrors", N_("%lu with invalid headers"), opt_number},
e0bf701
+    {"InAddrErrors", N_("%lu with invalid addresses"), opt_number},
e0bf701
+    {"ForwDatagrams", N_("%lu forwarded"), number},
e0bf701
+    {"InUnknownProtos", N_("%lu with unknown protocol"), opt_number},
e0bf701
+    {"InDiscards", N_("%lu incoming packets discarded"), number},
e0bf701
+    {"InDelivers", N_("%lu incoming packets delivered"), number},
e0bf701
+    {"OutRequests", N_("%lu requests sent out"), number},	/*? */
e0bf701
+    {"OutDiscards", N_("%lu outgoing packets dropped"), opt_number},
e0bf701
+    {"OutNoRoutes", N_("%lu dropped because of missing route"), opt_number},
e0bf701
+    {"ReasmTimeout", N_("%lu fragments dropped after timeout"), opt_number},
e0bf701
+    {"ReasmReqds", N_("%lu reassemblies required"), opt_number},	/* ? */
e0bf701
+    {"ReasmOKs", N_("%lu packets reassembled ok"), opt_number},
e0bf701
+    {"ReasmFails", N_("%lu packet reassembles failed"), opt_number},
e0bf701
+    {"FragOKs", N_("%lu fragments received ok"), opt_number},
e0bf701
+    {"FragFails", N_("%lu fragments failed"), opt_number},
e0bf701
+    {"FragCreates", N_("%lu fragments created"), opt_number}
e0bf701
 };
e0bf701
 
e0bf701
 struct entry Icmptab[] =
e0bf701
 {
e0bf701
-    {"InMsgs", N_("%u ICMP messages received"), number},
e0bf701
-    {"InErrors", N_("%u input ICMP message failed."), number},
e0bf701
-    {"InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InTimeExcds", N_("timeout in transit: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InParmProbs", N_("wrong parameters: %u"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
-    {"InSrcQuenchs", N_("source quenches: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InEchoReps", N_("echo replies: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InTimestamps", N_("timestamp request: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InTimestampReps", N_("timestamp reply: %u"), i_inp_icmp | I_TITLE},
e0bf701
-    {"InAddrMasks", N_("address mask request: %u"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
-    {"InAddrMaskReps", N_("address mask replies: %u"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
-    {"OutMsgs", N_("%u ICMP messages sent"), number},
e0bf701
-    {"OutErrors", N_("%u ICMP messages failed"), number},
e0bf701
-    {"OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutTimeExcds", N_("time exceeded: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutParmProbs", N_("wrong parameters: %u"), i_outp_icmp | I_TITLE},	/*? */
e0bf701
-    {"OutSrcQuenchs", N_("source quench: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutRedirects", N_("redirect: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutEchos", N_("echo request: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutEchoReps", N_("echo replies: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutTimestamps", N_("timestamp requests: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutTimestampReps", N_("timestamp replies: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutAddrMasks", N_("address mask requests: %u"), i_outp_icmp | I_TITLE},
e0bf701
-    {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE},
e0bf701
+    {"InMsgs", N_("%lu ICMP messages received"), number},
e0bf701
+    {"InErrors", N_("%lu input ICMP message failed."), number},
e0bf701
+    {"InDestUnreachs", N_("destination unreachable: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InTimeExcds", N_("timeout in transit: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InParmProbs", N_("wrong parameters: %lu"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
+    {"InSrcQuenchs", N_("source quenches: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InRedirects", N_("redirects: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InEchos", N_("echo requests: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InEchoReps", N_("echo replies: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InTimestamps", N_("timestamp request: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InTimestampReps", N_("timestamp reply: %lu"), i_inp_icmp | I_TITLE},
e0bf701
+    {"InAddrMasks", N_("address mask request: %lu"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
+    {"InAddrMaskReps", N_("address mask replies: %lu"), i_inp_icmp | I_TITLE},	/*? */
e0bf701
+    {"OutMsgs", N_("%lu ICMP messages sent"), number},
e0bf701
+    {"OutErrors", N_("%lu ICMP messages failed"), number},
e0bf701
+    {"OutDestUnreachs", N_("destination unreachable: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutTimeExcds", N_("time exceeded: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutParmProbs", N_("wrong parameters: %lu"), i_outp_icmp | I_TITLE},	/*? */
e0bf701
+    {"OutSrcQuenchs", N_("source quench: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutRedirects", N_("redirect: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutEchos", N_("echo request: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutEchoReps", N_("echo replies: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutTimestamps", N_("timestamp requests: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutTimestampReps", N_("timestamp replies: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutAddrMasks", N_("address mask requests: %lu"), i_outp_icmp | I_TITLE},
e0bf701
+    {"OutAddrMaskReps", N_("address mask replies: %lu"), i_outp_icmp | I_TITLE},
e0bf701
 };
e0bf701
 
e0bf701
 struct entry Tcptab[] =
e0bf701
@@ -119,71 +119,71 @@
e0bf701
     {"RtoMin", "", number},
e0bf701
     {"RtoMax", "", number},
e0bf701
     {"MaxConn", "", number},
e0bf701
-    {"ActiveOpens", N_("%u active connections openings"), number},
e0bf701
-    {"PassiveOpens", N_("%u passive connection openings"), number},
e0bf701
-    {"AttemptFails", N_("%u failed connection attempts"), number},
e0bf701
-    {"EstabResets", N_("%u connection resets received"), number},
e0bf701
-    {"CurrEstab", N_("%u connections established"), number},
e0bf701
-    {"InSegs", N_("%u segments received"), number},
e0bf701
-    {"OutSegs", N_("%u segments send out"), number},
e0bf701
-    {"RetransSegs", N_("%u segments retransmited"), number},
e0bf701
-    {"InErrs", N_("%u bad segments received."), number},
e0bf701
-    {"OutRsts", N_("%u resets sent"), number},
e0bf701
+    {"ActiveOpens", N_("%lu active connections openings"), number},
e0bf701
+    {"PassiveOpens", N_("%lu passive connection openings"), number},
e0bf701
+    {"AttemptFails", N_("%lu failed connection attempts"), number},
e0bf701
+    {"EstabResets", N_("%lu connection resets received"), number},
e0bf701
+    {"CurrEstab", N_("%lu connections established"), number},
e0bf701
+    {"InSegs", N_("%lu segments received"), number},
e0bf701
+    {"OutSegs", N_("%lu segments send out"), number},
e0bf701
+    {"RetransSegs", N_("%lu segments retransmited"), number},
e0bf701
+    {"InErrs", N_("%lu bad segments received."), number},
e0bf701
+    {"OutRsts", N_("%lu resets sent"), number},
e0bf701
 };
e0bf701
 
e0bf701
 struct entry Udptab[] =
e0bf701
 {
e0bf701
-    {"InDatagrams", N_("%u packets received"), number},
e0bf701
-    {"NoPorts", N_("%u packets to unknown port received."), number},
e0bf701
-    {"InErrors", N_("%u packet receive errors"), number},
e0bf701
-    {"OutDatagrams", N_("%u packets sent"), number},
e0bf701
+    {"InDatagrams", N_("%lu packets received"), number},
e0bf701
+    {"NoPorts", N_("%lu packets to unknown port received."), number},
e0bf701
+    {"InErrors", N_("%lu packet receive errors"), number},
e0bf701
+    {"OutDatagrams", N_("%lu packets sent"), number},
e0bf701
 };
e0bf701
 
e0bf701
 struct entry Tcpexttab[] =
e0bf701
 {
e0bf701
-    {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number},
e0bf701
-    {"SyncookiesRecv", N_("%u SYN cookies received"), opt_number},
e0bf701
-    {"SyncookiesFailed", N_("%u invalid SYN cookies received"), opt_number},
e0bf701
+    {"SyncookiesSent", N_("%lu SYN cookies sent"), opt_number},
e0bf701
+    {"SyncookiesRecv", N_("%lu SYN cookies received"), opt_number},
e0bf701
+    {"SyncookiesFailed", N_("%lu invalid SYN cookies received"), opt_number},
e0bf701
 
e0bf701
-    { "EmbryonicRsts", N_("%u resets received for embryonic SYN_RECV sockets"),
e0bf701
+    { "EmbryonicRsts", N_("%lu resets received for embryonic SYN_RECV sockets"),
e0bf701
       opt_number },  
e0bf701
-    { "PruneCalled", N_("%u packets pruned from receive queue because of socket"
e0bf701
+    { "PruneCalled", N_("%lu packets pruned from receive queue because of socket"
e0bf701
 			" buffer overrun"), opt_number },  
e0bf701
     /* obsolete: 2.2.0 doesn't do that anymore */
e0bf701
-    { "RcvPruned", N_("%u packets pruned from receive queue"), opt_number },
e0bf701
-    { "OfoPruned", N_("%u packets dropped from out-of-order queue because of"
e0bf701
+    { "RcvPruned", N_("%lu packets pruned from receive queue"), opt_number },
e0bf701
+    { "OfoPruned", N_("%lu packets dropped from out-of-order queue because of"
e0bf701
 		      " socket buffer overrun"), opt_number }, 
e0bf701
-    { "OutOfWindowIcmps", N_("%u ICMP packets dropped because they were "
e0bf701
+    { "OutOfWindowIcmps", N_("%lu ICMP packets dropped because they were "
e0bf701
 			     "out-of-window"), opt_number }, 
e0bf701
-    { "LockDroppedIcmps", N_("%u ICMP packets dropped because"
e0bf701
+    { "LockDroppedIcmps", N_("%lu ICMP packets dropped because"
e0bf701
 			     " socket was locked"), opt_number },
e0bf701
-    { "TW", N_("%u TCP sockets finished time wait in fast timer"), opt_number },
e0bf701
-    { "TWRecycled", N_("%u time wait sockets recycled by time stamp"), opt_number }, 
e0bf701
-    { "TWKilled", N_("%u TCP sockets finished time wait in slow timer"), opt_number },
e0bf701
-    { "PAWSPassive", N_("%u passive connections rejected because of"
e0bf701
+    { "TW", N_("%lu TCP sockets finished time wait in fast timer"), opt_number },
e0bf701
+    { "TWRecycled", N_("%lu time wait sockets recycled by time stamp"), opt_number }, 
e0bf701
+    { "TWKilled", N_("%lu TCP sockets finished time wait in slow timer"), opt_number },
e0bf701
+    { "PAWSPassive", N_("%lu passive connections rejected because of"
e0bf701
 			" time stamp"), opt_number },
e0bf701
-    { "PAWSActive", N_("%u active connections rejected because of "
e0bf701
+    { "PAWSActive", N_("%lu active connections rejected because of "
e0bf701
 		       "time stamp"), opt_number },
e0bf701
-    { "PAWSEstab", N_("%u packets rejects in established connections because of"
e0bf701
+    { "PAWSEstab", N_("%lu packets rejects in established connections because of"
e0bf701
 		      " timestamp"), opt_number },
e0bf701
-    { "DelayedACKs", N_("%u delayed acks sent"), opt_number },
e0bf701
-    { "DelayedACKLocked", N_("%u delayed acks further delayed because of"
e0bf701
+    { "DelayedACKs", N_("%lu delayed acks sent"), opt_number },
e0bf701
+    { "DelayedACKLocked", N_("%lu delayed acks further delayed because of"
e0bf701
 			     " locked socket"), opt_number },
e0bf701
-    { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number },
e0bf701
-    { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"),
e0bf701
+    { "DelayedACKLost", N_("Quick ack mode was activated %lu times"), opt_number },
e0bf701
+    { "ListenOverflows", N_("%lu times the listen queue of a socket overflowed"),
e0bf701
       opt_number },
e0bf701
-    { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number },
e0bf701
-    { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), 
e0bf701
+    { "ListenDrops", N_("%lu SYNs to LISTEN sockets ignored"), opt_number },
e0bf701
+    { "TCPPrequeued", N_("%lu packets directly queued to recvmsg prequeue."), 
e0bf701
       opt_number },
e0bf701
-    { "TCPDirectCopyFromBacklog", N_("%u packets directly received"
e0bf701
+    { "TCPDirectCopyFromBacklog", N_("%lu packets directly received"
e0bf701
 				     " from backlog"), opt_number },
e0bf701
-    { "TCPDirectCopyFromPrequeue", N_("%u packets directly received"
e0bf701
+    { "TCPDirectCopyFromPrequeue", N_("%lu packets directly received"
e0bf701
 				      " from prequeue"), opt_number },
e0bf701
-    { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number },
e0bf701
-    { "TCPHPHits", N_("%u packets header predicted"), number },
e0bf701
-    { "TCPHPHitsToUser", N_("%u packets header predicted and "
e0bf701
+    { "TCPPrequeueDropped", N_("%lu packets dropped from prequeue"), opt_number },
e0bf701
+    { "TCPHPHits", N_("%lu packets header predicted"), number },
e0bf701
+    { "TCPHPHitsToUser", N_("%lu packets header predicted and "
e0bf701
 			    "directly queued to user"), opt_number },
e0bf701
-    { "SockMallocOOM", N_("Ran %u times out of system memory during " 
e0bf701
+    { "SockMallocOOM", N_("Ran %lu times out of system memory during " 
e0bf701
 			  "packet sending"), opt_number }, 
e0bf701
 };
e0bf701