From e9cf15f2093ffe946c72952925a5f6803abb2bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radek=20Vok=C3=A1l?= Date: Tue, 26 Apr 2005 09:54:30 +0000 Subject: [PATCH] - don't show "duplicate line" warning (#143933) - netstat has new statistcs (#133032) --- net-tools-1.60-duplicate-tcp.patch | 2 +- net-tools-1.60-statistics.patch | 65 ++++++++++++++++++++++++++++++ net-tools.spec | 7 +++- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 net-tools-1.60-statistics.patch diff --git a/net-tools-1.60-duplicate-tcp.patch b/net-tools-1.60-duplicate-tcp.patch index b0f5dac..316ac65 100644 --- a/net-tools-1.60-duplicate-tcp.patch +++ b/net-tools-1.60-duplicate-tcp.patch @@ -177,7 +177,7 @@ + /* make sure that we haven't seen this socket pair before */ + if (tcp_node_hash_check_and_append(local_addr, local_port, + rem_addr, rem_port) < 0) { -+ fprintf(stderr, _("warning, got duplicate tcp line.\n")); ++ /* fprintf(stderr, _("warning, got duplicate tcp line.\n")); */ + return; + } + diff --git a/net-tools-1.60-statistics.patch b/net-tools-1.60-statistics.patch new file mode 100644 index 0000000..d3a5649 --- /dev/null +++ b/net-tools-1.60-statistics.patch @@ -0,0 +1,65 @@ +--- net-tools-1.60/statistics.c.tcpdata 2005-04-26 10:38:10.000000000 +0200 ++++ net-tools-1.60/statistics.c 2005-04-26 10:36:19.000000000 +0200 +@@ -1,6 +1,6 @@ + /* + * Copyright 1997,1999,2000 Andi Kleen. Subject to the GPL. +- * $Id: statistics.c,v 1.14 2001/02/02 18:01:23 pb Exp $ ++ * $Id: statistics.c,v 1.17 2002/04/28 15:41:01 ak Exp $ + * 19980630 - i18n - Arnaldo Carvalho de Melo + * 19981113 - i18n fixes - Arnaldo Carvalho de Melo + * 19990101 - added net/netstat, -t, -u, -w supprt - Bernd Eckenfels +@@ -185,6 +185,44 @@ + "directly queued to user"), opt_number }, + { "SockMallocOOM", N_("Ran %lu times out of system memory during " + "packet sending"), opt_number }, ++ { "TCPPureAcks", N_("%u acknowledgments not containing data received"), opt_number }, ++ { "TCPHPAcks", N_("%u predicted acknowledgments"), opt_number }, ++ { "TCPRenoRecovery", N_("%u times recovered from packet loss due to fast retransmit"), opt_number }, ++ { "TCPSackRecovery", N_("%u times recovered from packet loss due to SACK data"), opt_number }, ++ { "TCPSACKReneging", N_("%u bad SACKs received"), opt_number }, ++ { "TCPFACKReorder", N_("Detected reordering %u times using FACK"), opt_number }, ++ { "TCPSACKReorder", N_("Detected reordering %u times using SACK"), opt_number }, ++ { "TCPTSReorder", N_("Detected reordering %u times using time stamp"), opt_number }, ++ { "TCPRenoReorder", N_("Detected reordering %u times using reno fast retransmit"), opt_number }, ++ { "TCPFullUndo", N_("%u congestion windows fully recovered"), opt_number }, ++ { "TCPPartialUndo", N_("%u congestion windows partially recovered using Hoe heuristic"), opt_number }, ++ { "TCPDSackUndo", N_("%u congestion window recovered using DSACK"), opt_number }, ++ { "TCPLossUndo", N_("%u congestion windows recovered after partial ack"), opt_number }, ++ { "TCPLostRetransmits", N_("%u retransmits lost"), opt_number }, ++ { "TCPRenoFailures", N_("%u timeouts after reno fast retransmit"), opt_number }, ++ { "TCPSackFailures", N_("%u timeouts after SACK recovery"), opt_number }, ++ { "TCPLossFailures", N_("%u timeouts in loss state"), opt_number }, ++ { "TCPFastRetrans", N_("%u fast retransmits"), opt_number }, ++ { "TCPForwardRetrans", N_("%u forward retransmits"), opt_number }, ++ { "TCPSlowStartRetrans", N_("%u retransmits in slow start"), opt_number }, ++ { "TCPTimeouts", N_("%u other TCP timeouts"), opt_number }, ++ { "TCPRenoRecoveryFailed", N_("%u reno fast retransmits failed"), opt_number }, ++ { "TCPSackRecoveryFail", N_("%u sack retransmits failed"), opt_number }, ++ { "TCPSchedulerFailed", N_("%u times receiver scheduled too late for direct processing"), opt_number }, ++ { "TCPRcvCollapsed", N_("%u packets collapsed in receive queue due to low socket buffer"), opt_number }, ++ { "TCPDSACKOldSent", N_("%u DSACKs sent for old packets"), opt_number }, ++ { "TCPDSACKOfoSent", N_("%u DSACKs sent for out of order packets"), opt_number }, ++ { "TCPDSACKRecv", N_("%u DSACKs received"), opt_number }, ++ { "TCPDSACKOfoRecv", N_("%u DSACKs for out of order packets received"), opt_number }, ++ { "TCPAbortOnSyn", N_("%u connections reset due to unexpected SYN"), opt_number }, ++ { "TCPAbortOnData", N_("%u connections reset due to unexpected data"), opt_number }, ++ { "TCPAbortOnClose", N_("%u connections reset due to early user close"), opt_number }, ++ { "TCPAbortOnMemory", N_("%u connections aborted due to memory pressure"), opt_number }, ++ { "TCPAbortOnTimeout", N_("%u connections aborted due to timeout"), opt_number }, ++ { "TCPAbortOnLinger", N_("%u connections aborted after user close in linger timeout"), opt_number }, ++ { "TCPAbortFailed", N_("%u times unabled to send RST due to no memory"), opt_number }, ++ { "TCPMemoryPressures", N_("TCP ran low on memory %u times"), opt_number }, ++ { "TCPLoss", N_("%u TCP data loss events") }, + }; + + struct tabtab { +@@ -222,7 +260,8 @@ + ent = bsearch(&key, tab->tab, tab->size / sizeof(struct entry), + sizeof(struct entry), cmpentries); + if (!ent) { /* try our best */ +- printf("%*s%s: %d\n", states[state].indent, "", title, val); ++ if (val) ++ printf("%*s%s: %d\n", states[state].indent, "", title, val); + return; + } + type = ent->type; diff --git a/net-tools.spec b/net-tools.spec index f67df62..b41e96d 100644 --- a/net-tools.spec +++ b/net-tools.spec @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 51.test1 +Release: 52 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -52,6 +52,7 @@ Patch37: net-tools-1.60-pie.patch Patch38: net-tools-1.60-ifaceopt.patch Patch39: net-tools-1.60-trim_iface.patch Patch40: net-tools-1.60-stdo.patch +Patch41: net-tools-1.60-statistics.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -100,6 +101,7 @@ ifconfig, netstat, route, and others. %patch38 -p1 -b .ifaceopt %patch39 -p1 -b .trim-iface %patch40 -p1 -b .stdo +%patch41 -p1 -b .statistics cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -208,6 +210,9 @@ exit 0 %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue Apr 26 2005 Radek Vokal 1.60-52 +- don't show "duplicate line" warning (#143933) +- netstat has new statistcs (#133032) - /etc/neplug is owned by net-tools (#130621) * Tue Apr 05 2005 Radek Vokal 1.60-51