9dd485525d
Do not show interface metric in 'ifconfig', 'ifconfig -s' and 'netstat -i'. Spare place is used for interface name so trim_iface.patch is no longer needed. No need to convert man pages to utf-8 as upstream ship them in utf-8 now.
103 lines
3.8 KiB
Diff
103 lines
3.8 KiB
Diff
diff -up net-tools-1.60/man/en_US/netstat.8.interface net-tools-1.60/man/en_US/netstat.8
|
|
--- net-tools-1.60/man/en_US/netstat.8.interface 2012-01-19 15:11:22.176127422 +0100
|
|
+++ net-tools-1.60/man/en_US/netstat.8 2012-01-19 15:11:22.182127345 +0100
|
|
@@ -46,9 +46,9 @@ netstat \- Print network connections, ro
|
|
.RB [delay]
|
|
.P
|
|
.B netstat
|
|
-.RB { \-\-interfaces | \-i }
|
|
+.RB { \-\-interfaces | \-I | \-i }
|
|
.RB [ \-\-all | \-a ]
|
|
-.RB [ \-\-extend | \-e [ \-\-extend | \-e] ]
|
|
+.RB [ \-\-extend | \-e ]
|
|
.RB [ \-\-verbose | \-v ]
|
|
.RB [ \-\-program | \-p ]
|
|
.RB [ \-\-numeric | \-n ]
|
|
@@ -130,8 +130,8 @@ and
|
|
produce the same output.
|
|
.SS "\-\-groups , \-g"
|
|
Display multicast group membership information for IPv4 and IPv6.
|
|
-.SS "\-\-interfaces, \-i"
|
|
-Display a table of all network interfaces.
|
|
+.SS "\-\-interfaces=\fIiface \fR, \fB\-I=\fIiface \fR, \fB\-i"
|
|
+Display a table of all network interfaces, or the specified \fIiface\fR.
|
|
.SS "\-\-masquerade , \-M"
|
|
Display a list of masqueraded connections.
|
|
.SS "\-\-statistics , \-s"
|
|
diff -up net-tools-1.60/netstat.c.interface net-tools-1.60/netstat.c
|
|
--- net-tools-1.60/netstat.c.interface 2012-01-19 15:11:22.163127584 +0100
|
|
+++ net-tools-1.60/netstat.c 2012-01-19 15:12:16.094453349 +0100
|
|
@@ -145,6 +145,7 @@ char *Release = RELEASE, *Version = "net
|
|
#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;
|
|
@@ -1786,6 +1787,7 @@ static int rfcomm_info(void)
|
|
static int iface_info(void)
|
|
{
|
|
static int count=0;
|
|
+ struct interface *ife = NULL;
|
|
|
|
if (skfd < 0) {
|
|
if ((skfd = sockets_open(0)) < 0) {
|
|
@@ -1800,7 +1802,11 @@ static int iface_info(void)
|
|
printf(_("Iface MTU 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);
|
|
}
|
|
@@ -1826,9 +1832,10 @@ static void usage(void)
|
|
{
|
|
fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
|
|
fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
|
|
- fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n"));
|
|
+ fprintf(stderr, _(" netstat { [-vWeenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n"));
|
|
|
|
fprintf(stderr, _(" -r, --route display routing 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"));
|
|
@@ -1869,7 +1876,7 @@ int main
|
|
{
|
|
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
|
|
@@ -1913,7 +1920,7 @@ int main
|
|
getroute_init(); /* Set up AF routing support */
|
|
|
|
afname[0] = '\0';
|
|
- while ((i = getopt_long(argc, argv, "A:CFMacdeghilnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF)
|
|
+ while ((i = getopt_long(argc, argv, "A:CFMacdeghiI::lnNoprsStuUvVWwx64?Z", longopts, &lop)) != EOF)
|
|
switch (i) {
|
|
case -1:
|
|
break;
|
|
@@ -1954,6 +1961,13 @@ int main
|
|
case 'p':
|
|
flag_prg++;
|
|
break;
|
|
+ case 'I':
|
|
+ if (optarg && strcmp(optarg, "(null)"))
|
|
+ if (optarg[0] == '=') optarg++;
|
|
+ if (optarg && strcmp(optarg, "(null)"))
|
|
+ flag_int_name = strdup(optarg);
|
|
+ flag_int++;
|
|
+ break;
|
|
case 'i':
|
|
flag_int++;
|
|
break;
|