]>
Commit | Line | Data |
---|---|---|
236898d6 MT |
1 | diff -urN net-tools-1.60/statistics.c net-tools-1.60-patch/statistics.c |
2 | --- net-tools-1.60/statistics.c 2001-02-02 10:01:23.000000000 -0800 | |
3 | +++ net-tools-1.60-patch/statistics.c 2004-06-15 11:09:44.000000000 -0700 | |
4 | @@ -63,54 +63,54 @@ | |
5 | struct entry Iptab[] = | |
6 | { | |
7 | {"Forwarding", N_("Forwarding is %s"), i_forward | I_STATIC}, | |
8 | - {"DefaultTTL", N_("Default TTL is %u"), number | I_STATIC}, | |
9 | - {"InReceives", N_("%u total packets received"), number}, | |
10 | - {"InHdrErrors", N_("%u with invalid headers"), opt_number}, | |
11 | - {"InAddrErrors", N_("%u with invalid addresses"), opt_number}, | |
12 | - {"ForwDatagrams", N_("%u forwarded"), number}, | |
13 | - {"InUnknownProtos", N_("%u with unknown protocol"), opt_number}, | |
14 | - {"InDiscards", N_("%u incoming packets discarded"), number}, | |
15 | - {"InDelivers", N_("%u incoming packets delivered"), number}, | |
16 | - {"OutRequests", N_("%u requests sent out"), number}, /*? */ | |
17 | - {"OutDiscards", N_("%u outgoing packets dropped"), opt_number}, | |
18 | - {"OutNoRoutes", N_("%u dropped because of missing route"), opt_number}, | |
19 | - {"ReasmTimeout", N_("%u fragments dropped after timeout"), opt_number}, | |
20 | - {"ReasmReqds", N_("%u reassemblies required"), opt_number}, /* ? */ | |
21 | - {"ReasmOKs", N_("%u packets reassembled ok"), opt_number}, | |
22 | - {"ReasmFails", N_("%u packet reassembles failed"), opt_number}, | |
23 | - {"FragOKs", N_("%u fragments received ok"), opt_number}, | |
24 | - {"FragFails", N_("%u fragments failed"), opt_number}, | |
25 | - {"FragCreates", N_("%u fragments created"), opt_number} | |
26 | + {"DefaultTTL", N_("Default TTL is %lu"), number | I_STATIC}, | |
27 | + {"InReceives", N_("%lu total packets received"), number}, | |
28 | + {"InHdrErrors", N_("%lu with invalid headers"), opt_number}, | |
29 | + {"InAddrErrors", N_("%lu with invalid addresses"), opt_number}, | |
30 | + {"ForwDatagrams", N_("%lu forwarded"), number}, | |
31 | + {"InUnknownProtos", N_("%lu with unknown protocol"), opt_number}, | |
32 | + {"InDiscards", N_("%lu incoming packets discarded"), number}, | |
33 | + {"InDelivers", N_("%lu incoming packets delivered"), number}, | |
34 | + {"OutRequests", N_("%lu requests sent out"), number}, /*? */ | |
35 | + {"OutDiscards", N_("%lu outgoing packets dropped"), opt_number}, | |
36 | + {"OutNoRoutes", N_("%lu dropped because of missing route"), opt_number}, | |
37 | + {"ReasmTimeout", N_("%lu fragments dropped after timeout"), opt_number}, | |
38 | + {"ReasmReqds", N_("%lu reassemblies required"), opt_number}, /* ? */ | |
39 | + {"ReasmOKs", N_("%lu packets reassembled ok"), opt_number}, | |
40 | + {"ReasmFails", N_("%lu packet reassembles failed"), opt_number}, | |
41 | + {"FragOKs", N_("%lu fragments received ok"), opt_number}, | |
42 | + {"FragFails", N_("%lu fragments failed"), opt_number}, | |
43 | + {"FragCreates", N_("%lu fragments created"), opt_number} | |
44 | }; | |
45 | ||
46 | struct entry Icmptab[] = | |
47 | { | |
48 | - {"InMsgs", N_("%u ICMP messages received"), number}, | |
49 | - {"InErrors", N_("%u input ICMP message failed."), number}, | |
50 | - {"InDestUnreachs", N_("destination unreachable: %u"), i_inp_icmp | I_TITLE}, | |
51 | - {"InTimeExcds", N_("timeout in transit: %u"), i_inp_icmp | I_TITLE}, | |
52 | - {"InParmProbs", N_("wrong parameters: %u"), i_inp_icmp | I_TITLE}, /*? */ | |
53 | - {"InSrcQuenchs", N_("source quenches: %u"), i_inp_icmp | I_TITLE}, | |
54 | - {"InRedirects", N_("redirects: %u"), i_inp_icmp | I_TITLE}, | |
55 | - {"InEchos", N_("echo requests: %u"), i_inp_icmp | I_TITLE}, | |
56 | - {"InEchoReps", N_("echo replies: %u"), i_inp_icmp | I_TITLE}, | |
57 | - {"InTimestamps", N_("timestamp request: %u"), i_inp_icmp | I_TITLE}, | |
58 | - {"InTimestampReps", N_("timestamp reply: %u"), i_inp_icmp | I_TITLE}, | |
59 | - {"InAddrMasks", N_("address mask request: %u"), i_inp_icmp | I_TITLE}, /*? */ | |
60 | - {"InAddrMaskReps", N_("address mask replies: %u"), i_inp_icmp | I_TITLE}, /*? */ | |
61 | - {"OutMsgs", N_("%u ICMP messages sent"), number}, | |
62 | - {"OutErrors", N_("%u ICMP messages failed"), number}, | |
63 | - {"OutDestUnreachs", N_("destination unreachable: %u"), i_outp_icmp | I_TITLE}, | |
64 | - {"OutTimeExcds", N_("time exceeded: %u"), i_outp_icmp | I_TITLE}, | |
65 | - {"OutParmProbs", N_("wrong parameters: %u"), i_outp_icmp | I_TITLE}, /*? */ | |
66 | - {"OutSrcQuenchs", N_("source quench: %u"), i_outp_icmp | I_TITLE}, | |
67 | - {"OutRedirects", N_("redirect: %u"), i_outp_icmp | I_TITLE}, | |
68 | - {"OutEchos", N_("echo request: %u"), i_outp_icmp | I_TITLE}, | |
69 | - {"OutEchoReps", N_("echo replies: %u"), i_outp_icmp | I_TITLE}, | |
70 | - {"OutTimestamps", N_("timestamp requests: %u"), i_outp_icmp | I_TITLE}, | |
71 | - {"OutTimestampReps", N_("timestamp replies: %u"), i_outp_icmp | I_TITLE}, | |
72 | - {"OutAddrMasks", N_("address mask requests: %u"), i_outp_icmp | I_TITLE}, | |
73 | - {"OutAddrMaskReps", N_("address mask replies: %u"), i_outp_icmp | I_TITLE}, | |
74 | + {"InMsgs", N_("%lu ICMP messages received"), number}, | |
75 | + {"InErrors", N_("%lu input ICMP message failed."), number}, | |
76 | + {"InDestUnreachs", N_("destination unreachable: %lu"), i_inp_icmp | I_TITLE}, | |
77 | + {"InTimeExcds", N_("timeout in transit: %lu"), i_inp_icmp | I_TITLE}, | |
78 | + {"InParmProbs", N_("wrong parameters: %lu"), i_inp_icmp | I_TITLE}, /*? */ | |
79 | + {"InSrcQuenchs", N_("source quenches: %lu"), i_inp_icmp | I_TITLE}, | |
80 | + {"InRedirects", N_("redirects: %lu"), i_inp_icmp | I_TITLE}, | |
81 | + {"InEchos", N_("echo requests: %lu"), i_inp_icmp | I_TITLE}, | |
82 | + {"InEchoReps", N_("echo replies: %lu"), i_inp_icmp | I_TITLE}, | |
83 | + {"InTimestamps", N_("timestamp request: %lu"), i_inp_icmp | I_TITLE}, | |
84 | + {"InTimestampReps", N_("timestamp reply: %lu"), i_inp_icmp | I_TITLE}, | |
85 | + {"InAddrMasks", N_("address mask request: %lu"), i_inp_icmp | I_TITLE}, /*? */ | |
86 | + {"InAddrMaskReps", N_("address mask replies: %lu"), i_inp_icmp | I_TITLE}, /*? */ | |
87 | + {"OutMsgs", N_("%lu ICMP messages sent"), number}, | |
88 | + {"OutErrors", N_("%lu ICMP messages failed"), number}, | |
89 | + {"OutDestUnreachs", N_("destination unreachable: %lu"), i_outp_icmp | I_TITLE}, | |
90 | + {"OutTimeExcds", N_("time exceeded: %lu"), i_outp_icmp | I_TITLE}, | |
91 | + {"OutParmProbs", N_("wrong parameters: %lu"), i_outp_icmp | I_TITLE}, /*? */ | |
92 | + {"OutSrcQuenchs", N_("source quench: %lu"), i_outp_icmp | I_TITLE}, | |
93 | + {"OutRedirects", N_("redirect: %lu"), i_outp_icmp | I_TITLE}, | |
94 | + {"OutEchos", N_("echo request: %lu"), i_outp_icmp | I_TITLE}, | |
95 | + {"OutEchoReps", N_("echo replies: %lu"), i_outp_icmp | I_TITLE}, | |
96 | + {"OutTimestamps", N_("timestamp requests: %lu"), i_outp_icmp | I_TITLE}, | |
97 | + {"OutTimestampReps", N_("timestamp replies: %lu"), i_outp_icmp | I_TITLE}, | |
98 | + {"OutAddrMasks", N_("address mask requests: %lu"), i_outp_icmp | I_TITLE}, | |
99 | + {"OutAddrMaskReps", N_("address mask replies: %lu"), i_outp_icmp | I_TITLE}, | |
100 | }; | |
101 | ||
102 | struct entry Tcptab[] = | |
103 | @@ -119,71 +119,71 @@ | |
104 | {"RtoMin", "", number}, | |
105 | {"RtoMax", "", number}, | |
106 | {"MaxConn", "", number}, | |
107 | - {"ActiveOpens", N_("%u active connections openings"), number}, | |
108 | - {"PassiveOpens", N_("%u passive connection openings"), number}, | |
109 | - {"AttemptFails", N_("%u failed connection attempts"), number}, | |
110 | - {"EstabResets", N_("%u connection resets received"), number}, | |
111 | - {"CurrEstab", N_("%u connections established"), number}, | |
112 | - {"InSegs", N_("%u segments received"), number}, | |
113 | - {"OutSegs", N_("%u segments send out"), number}, | |
114 | - {"RetransSegs", N_("%u segments retransmited"), number}, | |
115 | - {"InErrs", N_("%u bad segments received."), number}, | |
116 | - {"OutRsts", N_("%u resets sent"), number}, | |
117 | + {"ActiveOpens", N_("%lu active connections openings"), number}, | |
118 | + {"PassiveOpens", N_("%lu passive connection openings"), number}, | |
119 | + {"AttemptFails", N_("%lu failed connection attempts"), number}, | |
120 | + {"EstabResets", N_("%lu connection resets received"), number}, | |
121 | + {"CurrEstab", N_("%lu connections established"), number}, | |
122 | + {"InSegs", N_("%lu segments received"), number}, | |
123 | + {"OutSegs", N_("%lu segments send out"), number}, | |
124 | + {"RetransSegs", N_("%lu segments retransmited"), number}, | |
125 | + {"InErrs", N_("%lu bad segments received."), number}, | |
126 | + {"OutRsts", N_("%lu resets sent"), number}, | |
127 | }; | |
128 | ||
129 | struct entry Udptab[] = | |
130 | { | |
131 | - {"InDatagrams", N_("%u packets received"), number}, | |
132 | - {"NoPorts", N_("%u packets to unknown port received."), number}, | |
133 | - {"InErrors", N_("%u packet receive errors"), number}, | |
134 | - {"OutDatagrams", N_("%u packets sent"), number}, | |
135 | + {"InDatagrams", N_("%lu packets received"), number}, | |
136 | + {"NoPorts", N_("%lu packets to unknown port received."), number}, | |
137 | + {"InErrors", N_("%lu packet receive errors"), number}, | |
138 | + {"OutDatagrams", N_("%lu packets sent"), number}, | |
139 | }; | |
140 | ||
141 | struct entry Tcpexttab[] = | |
142 | { | |
143 | - {"SyncookiesSent", N_("%u SYN cookies sent"), opt_number}, | |
144 | - {"SyncookiesRecv", N_("%u SYN cookies received"), opt_number}, | |
145 | - {"SyncookiesFailed", N_("%u invalid SYN cookies received"), opt_number}, | |
146 | + {"SyncookiesSent", N_("%lu SYN cookies sent"), opt_number}, | |
147 | + {"SyncookiesRecv", N_("%lu SYN cookies received"), opt_number}, | |
148 | + {"SyncookiesFailed", N_("%lu invalid SYN cookies received"), opt_number}, | |
149 | ||
150 | - { "EmbryonicRsts", N_("%u resets received for embryonic SYN_RECV sockets"), | |
151 | + { "EmbryonicRsts", N_("%lu resets received for embryonic SYN_RECV sockets"), | |
152 | opt_number }, | |
153 | - { "PruneCalled", N_("%u packets pruned from receive queue because of socket" | |
154 | + { "PruneCalled", N_("%lu packets pruned from receive queue because of socket" | |
155 | " buffer overrun"), opt_number }, | |
156 | /* obsolete: 2.2.0 doesn't do that anymore */ | |
157 | - { "RcvPruned", N_("%u packets pruned from receive queue"), opt_number }, | |
158 | - { "OfoPruned", N_("%u packets dropped from out-of-order queue because of" | |
159 | + { "RcvPruned", N_("%lu packets pruned from receive queue"), opt_number }, | |
160 | + { "OfoPruned", N_("%lu packets dropped from out-of-order queue because of" | |
161 | " socket buffer overrun"), opt_number }, | |
162 | - { "OutOfWindowIcmps", N_("%u ICMP packets dropped because they were " | |
163 | + { "OutOfWindowIcmps", N_("%lu ICMP packets dropped because they were " | |
164 | "out-of-window"), opt_number }, | |
165 | - { "LockDroppedIcmps", N_("%u ICMP packets dropped because" | |
166 | + { "LockDroppedIcmps", N_("%lu ICMP packets dropped because" | |
167 | " socket was locked"), opt_number }, | |
168 | - { "TW", N_("%u TCP sockets finished time wait in fast timer"), opt_number }, | |
169 | - { "TWRecycled", N_("%u time wait sockets recycled by time stamp"), opt_number }, | |
170 | - { "TWKilled", N_("%u TCP sockets finished time wait in slow timer"), opt_number }, | |
171 | - { "PAWSPassive", N_("%u passive connections rejected because of" | |
172 | + { "TW", N_("%lu TCP sockets finished time wait in fast timer"), opt_number }, | |
173 | + { "TWRecycled", N_("%lu time wait sockets recycled by time stamp"), opt_number }, | |
174 | + { "TWKilled", N_("%lu TCP sockets finished time wait in slow timer"), opt_number }, | |
175 | + { "PAWSPassive", N_("%lu passive connections rejected because of" | |
176 | " time stamp"), opt_number }, | |
177 | - { "PAWSActive", N_("%u active connections rejected because of " | |
178 | + { "PAWSActive", N_("%lu active connections rejected because of " | |
179 | "time stamp"), opt_number }, | |
180 | - { "PAWSEstab", N_("%u packets rejects in established connections because of" | |
181 | + { "PAWSEstab", N_("%lu packets rejects in established connections because of" | |
182 | " timestamp"), opt_number }, | |
183 | - { "DelayedACKs", N_("%u delayed acks sent"), opt_number }, | |
184 | - { "DelayedACKLocked", N_("%u delayed acks further delayed because of" | |
185 | + { "DelayedACKs", N_("%lu delayed acks sent"), opt_number }, | |
186 | + { "DelayedACKLocked", N_("%lu delayed acks further delayed because of" | |
187 | " locked socket"), opt_number }, | |
188 | - { "DelayedACKLost", N_("Quick ack mode was activated %u times"), opt_number }, | |
189 | - { "ListenOverflows", N_("%u times the listen queue of a socket overflowed"), | |
190 | + { "DelayedACKLost", N_("Quick ack mode was activated %lu times"), opt_number }, | |
191 | + { "ListenOverflows", N_("%lu times the listen queue of a socket overflowed"), | |
192 | opt_number }, | |
193 | - { "ListenDrops", N_("%u SYNs to LISTEN sockets ignored"), opt_number }, | |
194 | - { "TCPPrequeued", N_("%u packets directly queued to recvmsg prequeue."), | |
195 | + { "ListenDrops", N_("%lu SYNs to LISTEN sockets ignored"), opt_number }, | |
196 | + { "TCPPrequeued", N_("%lu packets directly queued to recvmsg prequeue."), | |
197 | opt_number }, | |
198 | - { "TCPDirectCopyFromBacklog", N_("%u packets directly received" | |
199 | + { "TCPDirectCopyFromBacklog", N_("%lu packets directly received" | |
200 | " from backlog"), opt_number }, | |
201 | - { "TCPDirectCopyFromPrequeue", N_("%u packets directly received" | |
202 | + { "TCPDirectCopyFromPrequeue", N_("%lu packets directly received" | |
203 | " from prequeue"), opt_number }, | |
204 | - { "TCPPrequeueDropped", N_("%u packets dropped from prequeue"), opt_number }, | |
205 | - { "TCPHPHits", N_("%u packets header predicted"), number }, | |
206 | - { "TCPHPHitsToUser", N_("%u packets header predicted and " | |
207 | + { "TCPPrequeueDropped", N_("%lu packets dropped from prequeue"), opt_number }, | |
208 | + { "TCPHPHits", N_("%lu packets header predicted"), number }, | |
209 | + { "TCPHPHitsToUser", N_("%lu packets header predicted and " | |
210 | "directly queued to user"), opt_number }, | |
211 | - { "SockMallocOOM", N_("Ran %u times out of system memory during " | |
212 | + { "SockMallocOOM", N_("Ran %lu times out of system memory during " | |
213 | "packet sending"), opt_number }, | |
214 | }; | |
215 |