rpms/net-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- behaviour of netstat -i option changed (#115987)

Browse Source 
- netstat -i shows all interface, -I<Iface> only one
This commit is contained in:
Radek Vokál 2005-03-01 10:44:10 +00:00
parent 9945db7c44
commit 516105d156
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
net-tools-1.60-ifaceopt.patch Normal file
View File

@ -0,0 +1,52 @@
--- net-tools-1.60/netstat.c.ifaceopt 2005-03-01 12:11:43.695661632 +0100
+++ net-tools-1.60/netstat.c 2005-03-01 12:16:37.601981080 +0100
@@ -1658,10 +1658,11 @@
{
fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
fprintf(stderr, _(" netstat [-vnNcaeol] [<Socket> ...]\n"));
- fprintf(stderr, _(" netstat { [-veenNac] -i[<Iface>] | [-cnNe] -M | -s } [delay]\n\n"));
+ fprintf(stderr, _(" netstat { [-veenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s } [delay]\n\n"));
fprintf(stderr, _(" -r, --route display routing table\n"));
- fprintf(stderr, _(" -i, --interfaces=[<Iface>] display interface table\n"));
+ fprintf(stderr, _(" -I, --interfaces=[<Iface>] display interface table for <Iface>\n"));
+ fprintf(stderr, _(" -i, --interfaces display interface table\n"));
fprintf(stderr, _(" -g, --groups display multicast group memberships\n"));
fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n"));
#if HAVE_FW_MASQUERADE
@@ -1700,7 +1701,8 @@
{
AFTRANS_OPTS,
{"version", 0, 0, 'V'},
- {"interfaces", 2, 0, 'i'},
+ {"interfaces", 2, 0, 'I'},
+ {"interfaces", 0, 0, 'i'},
{"help", 0, 0, 'h'},
{"route", 0, 0, 'r'},
#if HAVE_FW_MASQUERADE
@@ -1738,7 +1740,8 @@
getroute_init(); /* Set up AF routing support */
afname[0] = '\0';
- while ((i = getopt_long(argc, argv, "MCFA:acdegphi::nNorstuVv?wxl", longopts, &lop)) != EOF)
+
+ while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxl", longopts, &lop)) != EOF)
switch (i) {
case -1:
break;
@@ -1779,11 +1782,14 @@
case 'p':
flag_prg++;
break;
- case 'i':
+ case 'I':
if (optarg && strcmp(optarg, "(null)"))
flag_int_name = strdup(optarg);
flag_int++;
break;
+ case 'i':
+ flag_int++;
+ break;
case 'n':
flag_not |= FLAG_NUM;
break;

8
net-tools.spec
View File

@ -3,7 +3,7 @@
Summary: Basic networking tools.
Name: net-tools
Version: 1.60
Release: 47
Release: 48
License: GPL
Group: System Environment/Base
Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
@ -47,6 +47,7 @@ Patch34: net-tools-1.60-ifconfig_ib.patch
Patch35: net-tools-1.60-de.patch
Patch36: netplug-1.2.9-execshield.patch
Patch37: net-tools-1.60-pie.patch
Patch38: net-tools-1.60-ifaceopt.patch
BuildRoot: %{_tmppath}/%{name}-root
Requires(post,preun): chkconfig
@ -92,6 +93,7 @@ ifconfig, netstat, route, and others.
%patch35 -p1
%patch36 -p1 -b .execshield
%patch37 -p1 -b .pie
%patch38 -p1 -b .ifaceopt
cp %SOURCE2 ./config.h
cp %SOURCE3 ./config.make
@ -195,6 +197,10 @@ exit 0
%{_sysconfdir}/rc.d/init.d/netplugd
%changelog
* Tue Mar 01 2005 Radek Vokal <rvokal@redhat.com> 1.60-48
- behaviour of netstat -i option changed (#115987)
- netstat -i shows all interface, -I<Iface> only one
* Mon Feb 28 2005 Radek Vokal <rvokal@redhat.com> 1.60-47
- added RPM_OPT_FLAGS
- execshield patch for netplug <t8m@redhat.com>