rpms/net-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity
bfb9be3ca3
net-tools/net-tools-1.60-interface.patch

111 lines
5.8 KiB
Diff
Raw Normal View History

auto-import changelog data from net-tools-1.60-20.1.src.rpm Mon Aug 25 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-20.1 -rebuilt Mon Aug 25 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-20 - interface option now works as described in the man page (#61113). Tue Aug 19 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-19.1 - rebuilt Tue Aug 19 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-19 - Fixed trailing blank bug in hostname output (#101263). - Remove -O2 fir alpha (#78955). - Updated netstat statistic output, was still broken. Tue Jun 17 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-18.1 - rebuilt Tue Jun 17 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-18 - fix ether-wake.c build with gcc 3.3 - rebuilt Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> - rebuilt Wed Jun 04 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-16.1 - Bumped release and rebuilt Fri May 23 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-16 - Fixed ether-wake usage output (#55801). Thu May 22 2003 Jeremy Katz <katzj@redhat.com> 1.60-15 - fix build with gcc 3.3 Thu May 22 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-14 - Fixed wrong manpage (#55473). Wed May 21 2003 Phil Knirsch <pknirsch@redhat.com> - Added inet6-lookup patch from John van Krieken (#84108). - Fixed outdated link in ifconfig manpage (#91287). Tue May 20 2003 Phil Knirsch <pknirsch@redhat.com> - Fixed incorrect address display for ipx (#46434). - Fixed wrongly installed manpage dirs (#50664). Wed Mar 19 2003 Phil Knirsch <pknirsch@redhat.com> 1.60-13 - Fixed nameif problem (#85748).
2004-09-09 09:10:51 +00:00
--- net-tools-1.60/netstat.c.interface 2003-08-25 17:06:30.000000000 +0200
+++ net-tools-1.60/netstat.c 2003-08-25 17:08:41.000000000 +0200
@@ -129,6 +129,7 @@
#define E_IOCTL -3
int flag_int = 0;
+char *flag_int_name = NULL;
int flag_rou = 0;
int flag_mas = 0;
int flag_sta = 0;
@@ -1441,6 +1442,7 @@
static int iface_info(void)
{
static int count=0;
+ struct interface *ife = NULL;
if (skfd < 0) {
if ((skfd = sockets_open(0)) < 0) {
@@ -1455,7 +1457,11 @@
printf(_("Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
}
- if (for_all_interfaces(do_if_print, &flag_all) < 0) {
+ if (flag_int_name) {
+ ife = lookup_interface(flag_int_name);
+ do_if_print(ife, &flag_all);
+ }
+ else if (for_all_interfaces(do_if_print, &flag_all) < 0) {
perror(_("missing interface information"));
exit(1);
}
@@ -1481,30 +1487,31 @@
{
fprintf(stderr, _("usage: netstat [-veenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
fprintf(stderr, _(" netstat [-vnNcaeol] [<Socket> ...]\n"));
- fprintf(stderr, _(" netstat { [-veenNac] -i | [-cnNe] -M | -s } [delay]\n\n"));
+ fprintf(stderr, _(" netstat { [-veenNac] -i[<Iface>] | [-cnNe] -M | -s } [delay]\n\n"));
- fprintf(stderr, _(" -r, --route display routing table\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"));
+ fprintf(stderr, _(" -r, --route display routing table\n"));
+ fprintf(stderr, _(" -i, --interfaces=[<Iface>] 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
- fprintf(stderr, _(" -M, --masquerade display masqueraded connections\n\n"));
+ fprintf(stderr, _(" -M, --masquerade display masqueraded connections\n\n"));
#endif
- fprintf(stderr, _(" -v, --verbose be verbose\n"));
- fprintf(stderr, _(" -n, --numeric don't resolve names\n"));
- fprintf(stderr, _(" --numeric-hosts don't resolve host names\n"));
- fprintf(stderr, _(" --numeric-ports don't resolve port names\n"));
- fprintf(stderr, _(" --numeric-users don't resolve user names\n"));
- fprintf(stderr, _(" -N, --symbolic resolve hardware names\n"));
- fprintf(stderr, _(" -e, --extend display other/more information\n"));
- fprintf(stderr, _(" -p, --programs display PID/Program name for sockets\n"));
- fprintf(stderr, _(" -c, --continuous continuous listing\n\n"));
- fprintf(stderr, _(" -l, --listening display listening server sockets\n"));
- fprintf(stderr, _(" -a, --all, --listening display all sockets (default: connected)\n"));
- fprintf(stderr, _(" -o, --timers display timers\n"));
- fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n"));
- fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n"));
+ fprintf(stderr, _(" -v, --verbose be verbose\n"));
+ fprintf(stderr, _(" -n, --numeric don't resolve names\n"));
+ fprintf(stderr, _(" --numeric-hosts don't resolve host names\n"));
+ fprintf(stderr, _(" --numeric-ports don't resolve port names\n"));
+ fprintf(stderr, _(" --numeric-users don't resolve user names\n"));
+ fprintf(stderr, _(" -N, --symbolic resolve hardware names\n"));
+ fprintf(stderr, _(" -e, --extend display other/more information\n"));
+ fprintf(stderr, _(" -p, --programs display PID/Program name for sockets\n"));
+ fprintf(stderr, _(" -c, --continuous continuous listing\n\n"));
+ fprintf(stderr, _(" -l, --listening display listening server sockets\n"));
+ fprintf(stderr, _(" -a, --all, --listening display all sockets (default: connected)\n"));
+ fprintf(stderr, _(" -o, --timers display timers\n"));
+ fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n"));
+ fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n"));
+ fprintf(stderr, _(" <Iface>: Name of interface to monitor/list.\n"));
fprintf(stderr, _(" <Socket>={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n"));
fprintf(stderr, _(" <AF>=Use '-A <af>' or '--<af>'; default: %s\n"), DFLT_AF);
fprintf(stderr, _(" List of possible address families (which support routing):\n"));
@@ -1522,7 +1529,7 @@
{
AFTRANS_OPTS,
{"version", 0, 0, 'V'},
- {"interfaces", 0, 0, 'i'},
+ {"interfaces", 2, 0, 'i'},
{"help", 0, 0, 'h'},
{"route", 0, 0, 'r'},
#if HAVE_FW_MASQUERADE
@@ -1560,7 +1567,7 @@
getroute_init(); /* Set up AF routing support */
afname[0] = '\0';
- while ((i = getopt_long(argc, argv, "MCFA:acdegphinNorstuVv?wxl", longopts, &lop)) != EOF)
+ while ((i = getopt_long(argc, argv, "MCFA:acdegphi::nNorstuVv?wxl", longopts, &lop)) != EOF)
switch (i) {
case -1:
break;
@@ -1602,6 +1609,8 @@
flag_prg++;
break;
case 'i':
+ if (optarg && strcmp(optarg, "(null)"))
+ flag_int_name = strdup(optarg);
flag_int++;
break;
case 'n':
Reference in New Issue Copy Permalink