update net-tools to 2.10
This commit is contained in:
parent
50981c01e3
commit
6187474e81
@ -156,10 +156,10 @@ diff -up net-tools-2.0/Makefile.interfaces net-tools-2.0/Makefile
|
|||||||
+++ net-tools-2.0/Makefile 2015-09-15 18:04:06.273668275 +0200
|
+++ net-tools-2.0/Makefile 2015-09-15 18:04:06.273668275 +0200
|
||||||
@@ -193,6 +193,9 @@ ipmaddr: $(NET_LIB) ipmaddr.o
|
@@ -193,6 +193,9 @@ ipmaddr: $(NET_LIB) ipmaddr.o
|
||||||
mii-tool: $(NET_LIB) mii-tool.o
|
mii-tool: $(NET_LIB) mii-tool.o
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) $(LDLIBS)
|
||||||
|
|
||||||
+ether-wake: $(NET_LIB) ether-wake.o
|
+ether-wake: $(NET_LIB) ether-wake.o
|
||||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ether-wake ether-wake.o $(NLIB)
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ether-wake ether-wake.o $(NLIB) $(LDLIBS)
|
||||||
+
|
+
|
||||||
installbin:
|
installbin:
|
||||||
@echo
|
@echo
|
||||||
@ -1,6 +1,6 @@
|
|||||||
diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c
|
diff -up net-tools-2.10/lib/interface.c.cycle net-tools-2.10/lib/interface.c
|
||||||
--- net-tools-2.0/lib/interface.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
--- net-tools-2.10/lib/interface.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
||||||
+++ net-tools-2.0/lib/interface.c 2016-03-30 09:58:18.247891588 +0200
|
+++ net-tools-2.10/lib/interface.c 2016-03-30 09:58:18.247891588 +0200
|
||||||
@@ -93,6 +93,7 @@ int if_list_all = 0; /* do we have reque
|
@@ -93,6 +93,7 @@ int if_list_all = 0; /* do we have reque
|
||||||
static struct interface *int_list, *int_last;
|
static struct interface *int_list, *int_last;
|
||||||
|
|
||||||
@ -161,9 +161,9 @@ diff -up net-tools-2.0/lib/interface.c.cycle net-tools-2.0/lib/interface.c
|
|||||||
fclose(fh);
|
fclose(fh);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat.8
|
diff -up net-tools-2.10/man/en_US/netstat.8.cycle net-tools-2.10/man/en_US/netstat.8
|
||||||
--- net-tools-2.0/man/en_US/netstat.8.cycle 2016-02-15 16:54:18.000000000 +0100
|
--- net-tools-2.10/man/en_US/netstat.8.cycle 2016-02-15 16:54:18.000000000 +0100
|
||||||
+++ net-tools-2.0/man/en_US/netstat.8 2016-03-30 09:58:18.241891637 +0200
|
+++ net-tools-2.10/man/en_US/netstat.8 2016-03-30 09:58:18.241891637 +0200
|
||||||
@@ -36,6 +36,7 @@ netstat \- Print network connections, ro
|
@@ -36,6 +36,7 @@ netstat \- Print network connections, ro
|
||||||
.RB [ \-\-verbose | \-v ]
|
.RB [ \-\-verbose | \-v ]
|
||||||
.RB [ \-\-continuous | \-c]
|
.RB [ \-\-continuous | \-c]
|
||||||
@ -247,9 +247,9 @@ diff -up net-tools-2.0/man/en_US/netstat.8.cycle net-tools-2.0/man/en_US/netstat
|
|||||||
.P
|
.P
|
||||||
.SH OUTPUT
|
.SH OUTPUT
|
||||||
.P
|
.P
|
||||||
diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
diff -up net-tools-2.10/netstat.c.cycle net-tools-2.10/netstat.c
|
||||||
--- net-tools-2.0/netstat.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
--- net-tools-2.10/netstat.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
||||||
+++ net-tools-2.0/netstat.c 2016-03-30 10:04:07.617171984 +0200
|
+++ net-tools-2.10/netstat.c 2016-03-30 10:04:07.617171984 +0200
|
||||||
@@ -115,8 +115,8 @@
|
@@ -115,8 +115,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -431,9 +431,9 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
}
|
}
|
||||||
if (flag_exp < 2) {
|
if (flag_exp < 2) {
|
||||||
ife_short = 1;
|
ife_short = 1;
|
||||||
- printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
- printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
||||||
+ if(!(count % 8))
|
+ if(!(count % 8))
|
||||||
+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
+ 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 (for_all_interfaces(do_if_print, &flag_all) < 0) {
|
||||||
@ -458,17 +458,17 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
@@ -1915,9 +2045,10 @@ static void usage(int rc)
|
@@ -1915,9 +2045,10 @@ static void usage(int rc)
|
||||||
{
|
FILE *fp = rc ? stderr : stdout;
|
||||||
fprintf(stderr, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
|
fprintf(fp, _("usage: netstat [-vWeenNcCF] [<Af>] -r netstat {-V|--version|-h|--help}\n"));
|
||||||
fprintf(stderr, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
|
fprintf(fp, _(" netstat [-vWnNcaeol] [<Socket> ...]\n"));
|
||||||
- fprintf(stderr, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
|
- fprintf(fp, _(" netstat { [-vWeenNac] -i | [-cnNe] -M | -s [-6tuw] }\n\n"));
|
||||||
+ fprintf(stderr, _(" netstat { [-vWeenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n"));
|
+ fprintf(fp, _(" netstat { [-vWeenNac] -I[<Iface>] | [-veenNac] -i | [-cnNe] -M | -s [-6tuw] } [delay]\n\n"));
|
||||||
|
|
||||||
fprintf(stderr, _(" -r, --route display routing table\n"));
|
fprintf(fp, _(" -r, --route display routing table\n"));
|
||||||
+ fprintf(stderr, _(" -I, --interfaces=<Iface> display interface table for <Iface>\n"));
|
+ fprintf(fp, _(" -I, --interfaces=<Iface> display interface table for <Iface>\n"));
|
||||||
fprintf(stderr, _(" -i, --interfaces display interface table\n"));
|
fprintf(fp, _(" -i, --interfaces display interface table\n"));
|
||||||
fprintf(stderr, _(" -g, --groups display multicast group memberships\n"));
|
fprintf(fp, _(" -g, --groups display multicast group memberships\n"));
|
||||||
fprintf(stderr, _(" -s, --statistics display networking statistics (like SNMP)\n"));
|
fprintf(fp, _(" -s, --statistics display networking statistics (like SNMP)\n"));
|
||||||
@@ -1957,11 +2088,12 @@ int main
|
@@ -1957,11 +2088,12 @@ int main
|
||||||
(int argc, char *argv[]) {
|
(int argc, char *argv[]) {
|
||||||
int i;
|
int i;
|
||||||
@ -528,7 +528,7 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
ENOSUPP("netstat", "FW_MASQUERADE");
|
ENOSUPP("netstat", "FW_MASQUERADE");
|
||||||
@@ -2182,15 +2327,16 @@ int main
|
@@ -2182,16 +2327,17 @@ int main
|
||||||
if (!afname[0])
|
if (!afname[0])
|
||||||
safe_strncpy(afname, DFLT_AF, sizeof(afname));
|
safe_strncpy(afname, DFLT_AF, sizeof(afname));
|
||||||
|
|
||||||
@ -539,6 +539,7 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
+ i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
|
+ i = parsesnmp(flag_raw, flag_tcp, flag_udp, flag_sctp);
|
||||||
#else
|
#else
|
||||||
ENOSUPP("netstat", "AF INET");
|
ENOSUPP("netstat", "AF INET");
|
||||||
|
exit(1);
|
||||||
#endif
|
#endif
|
||||||
} else if(!strcmp(afname, "inet6")) {
|
} else if(!strcmp(afname, "inet6")) {
|
||||||
#if HAVE_AFINET6
|
#if HAVE_AFINET6
|
||||||
@ -546,7 +547,7 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
+ i = parsesnmp6(flag_raw, flag_tcp, flag_udp);
|
+ i = parsesnmp6(flag_raw, flag_tcp, flag_udp);
|
||||||
#else
|
#else
|
||||||
ENOSUPP("netstat", "AF INET6");
|
ENOSUPP("netstat", "AF INET6");
|
||||||
#endif
|
exit(1);
|
||||||
@@ -2198,7 +2344,11 @@ int main
|
@@ -2198,7 +2344,11 @@ int main
|
||||||
printf(_("netstat: No statistics support for specified address family: %s\n"), afname);
|
printf(_("netstat: No statistics support for specified address family: %s\n"), afname);
|
||||||
exit(1);
|
exit(1);
|
||||||
@ -589,9 +590,9 @@ diff -up net-tools-2.0/netstat.c.cycle net-tools-2.0/netstat.c
|
|||||||
}
|
}
|
||||||
return (i);
|
return (i);
|
||||||
}
|
}
|
||||||
diff -up net-tools-2.0/statistics.c.cycle net-tools-2.0/statistics.c
|
diff -up net-tools-2.10/statistics.c.cycle net-tools-2.10/statistics.c
|
||||||
--- net-tools-2.0/statistics.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
--- net-tools-2.10/statistics.c.cycle 2016-02-15 16:54:18.000000000 +0100
|
||||||
+++ net-tools-2.0/statistics.c 2016-03-30 09:58:18.238891661 +0200
|
+++ net-tools-2.10/statistics.c 2016-03-30 09:58:18.238891661 +0200
|
||||||
@@ -527,7 +527,7 @@ static void process_fd2(FILE *f, const c
|
@@ -527,7 +527,7 @@ static void process_fd2(FILE *f, const c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -12,24 +12,27 @@ diff -up net-tools-2.0/man/en_US/arp.8.man net-tools-2.0/man/en_US/arp.8
|
|||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.B Arp
|
.B Arp
|
||||||
manipulates or displays the kernel's IPv4 network neighbour cache. It can add
|
manipulates or displays the kernel's IPv4 network neighbour cache. It can add
|
||||||
@@ -219,6 +223,6 @@ published proxy ARP entries and permanen
|
@@ -219,9 +223,6 @@ published proxy ARP entries and permanen
|
||||||
.br
|
|
||||||
.I /etc/ethers
|
.I /etc/ethers
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
-rarp(8), route(8), ifconfig(8), netstat(8)
|
.BR ethers (5),
|
||||||
+.BR ip(8)
|
-.BR rarp (8),
|
||||||
|
-.BR route (8),
|
||||||
|
-.BR ifconfig (8),
|
||||||
|
-.BR netstat (8)
|
||||||
|
+.BR ip (8)
|
||||||
.SH AUTHORS
|
.SH AUTHORS
|
||||||
Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
|
Fred N. van Kempen <waltje@uwalt.nl.mugnet.org>, Bernd Eckenfels <net\-tools@lina.inka.de>.
|
||||||
diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5
|
diff -up net-tools-2.0/man/en_US/ethers.5.man net-tools-2.0/man/en_US/ethers.5
|
||||||
--- net-tools-2.0/man/en_US/ethers.5.man 2014-04-26 02:45:16.000000000 +0200
|
--- net-tools-2.0/man/en_US/ethers.5.man 2014-04-26 02:45:16.000000000 +0200
|
||||||
+++ net-tools-2.0/man/en_US/ethers.5 2014-07-07 14:51:31.378459439 +0200
|
+++ net-tools-2.0/man/en_US/ethers.5 2014-07-07 14:51:31.378459439 +0200
|
||||||
@@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate
|
@@ -26,6 +26,3 @@ can be resolved by DNS or a dot separate
|
||||||
.SH FILES \"{{{
|
08:00:20:00:61:CA pal
|
||||||
|
.SH FILES
|
||||||
/etc/ethers
|
/etc/ethers
|
||||||
.\"}}}
|
-.SH "SEE ALSO"
|
||||||
-.SH "SEE ALSO" \"{{{
|
-.BR arp (8),
|
||||||
-rarp(8)
|
-.BR rarp (8)
|
||||||
-.\"}}}
|
|
||||||
diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8
|
diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig.8
|
||||||
--- net-tools-2.0/man/en_US/ifconfig.8.man 2014-04-26 02:45:16.000000000 +0200
|
--- net-tools-2.0/man/en_US/ifconfig.8.man 2014-04-26 02:45:16.000000000 +0200
|
||||||
+++ net-tools-2.0/man/en_US/ifconfig.8 2014-07-07 14:51:31.379459422 +0200
|
+++ net-tools-2.0/man/en_US/ifconfig.8 2014-07-07 14:51:31.379459422 +0200
|
||||||
@ -47,13 +50,19 @@ diff -up net-tools-2.0/man/en_US/ifconfig.8.man net-tools-2.0/man/en_US/ifconfig
|
|||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.B Ifconfig
|
.B Ifconfig
|
||||||
is used to configure the kernel-resident network interfaces. It is
|
is used to configure the kernel-resident network interfaces. It is
|
||||||
@@ -222,7 +229,8 @@ package to display link layer informatio
|
@@ -222,13 +229,8 @@ package to display link layer informatio
|
||||||
While appletalk DDP and IPX addresses will be displayed they cannot be
|
While appletalk DDP and IPX addresses will be displayed they cannot be
|
||||||
altered by this command.
|
altered by this command.
|
||||||
.SH SEE ALSO
|
.SH SEE ALSO
|
||||||
-route(8), netstat(8), arp(8), rarp(8), iptables(8), ifup(8), interfaces(5).
|
-.BR route (8),
|
||||||
+.BR ip(8),
|
-.BR netstat (8),
|
||||||
+.BR iptables(8)
|
-.BR arp (8),
|
||||||
|
-.BR rarp (8),
|
||||||
|
-.BR iptables (8),
|
||||||
|
-.BR ifup (8),
|
||||||
|
-.BR interfaces (5)
|
||||||
|
+.BR ip (8),
|
||||||
|
+.BR iptables (8)
|
||||||
.br
|
.br
|
||||||
http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
|
http://physics.nist.gov/cuu/Units/binary.html - Prefixes for binary multiples
|
||||||
.SH AUTHORS
|
.SH AUTHORS
|
||||||
@ -123,14 +132,16 @@ diff -up net-tools-2.0/man/en_US/route.8.man net-tools-2.0/man/en_US/route.8
|
|||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
.B Route
|
.B Route
|
||||||
manipulates the kernel's IP routing tables. Its primary use is to set
|
manipulates the kernel's IP routing tables. Its primary use is to set
|
||||||
@@ -330,10 +335,6 @@ Whether or not the hardware address for
|
@@ -330,11 +335,6 @@ Whether or not the hardware address for
|
||||||
.I /proc/net/rt_cache
|
|
||||||
.LP
|
.LP
|
||||||
.SH "SEE ALSO"
|
.SH "SEE ALSO"
|
||||||
-.IR ifconfig (8),
|
.BR ethers (5),
|
||||||
-.IR netstat (8),
|
-.BR arp (8),
|
||||||
-.IR arp (8),
|
-.BR rarp (8),
|
||||||
-.IR rarp (8),
|
-.BR route (8),
|
||||||
.IR ip (8)
|
-.BR ifconfig (8),
|
||||||
|
-.BR netstat (8)
|
||||||
.LP
|
.LP
|
||||||
.SH HISTORY
|
.SH HISTORY
|
||||||
|
.B Route
|
||||||
|
|
||||||
Binary file not shown.
BIN
net-tools-2.10.tar.xz
Normal file
BIN
net-tools-2.10.tar.xz
Normal file
Binary file not shown.
@ -1,34 +0,0 @@
|
|||||||
diff --git a/lib/interface.c.old b/lib/interface.c
|
|
||||||
index c734c83..9c49a03 100644
|
|
||||||
--- a/lib/interface.c.old
|
|
||||||
+++ b/lib/interface.c
|
|
||||||
@@ -928,10 +928,10 @@ void ife_print_long(struct interface *ptr)
|
|
||||||
*/
|
|
||||||
rx = ptr->stats.rx_bytes;
|
|
||||||
short_rx = rx * 10;
|
|
||||||
- if (rx > 1125899906842624ull) {
|
|
||||||
- if (rx > (9223372036854775807ull / 10))
|
|
||||||
- short_rx = rx / 112589990684262ull;
|
|
||||||
- else
|
|
||||||
+ if (rx > 1152921504606846976ull) {
|
|
||||||
+ short_rx = rx / 115292150460684697ull;
|
|
||||||
+ Rext = "EiB";
|
|
||||||
+ } else if (rx > 1125899906842624ull) {
|
|
||||||
short_rx /= 1125899906842624ull;
|
|
||||||
Rext = "PiB";
|
|
||||||
} else if (rx > 1099511627776ull) {
|
|
||||||
@@ -949,10 +949,10 @@ void ife_print_long(struct interface *ptr)
|
|
||||||
}
|
|
||||||
tx = ptr->stats.tx_bytes;
|
|
||||||
short_tx = tx * 10;
|
|
||||||
- if (tx > 1125899906842624ull) {
|
|
||||||
- if (tx > (9223372036854775807ull / 10))
|
|
||||||
- short_tx = tx / 112589990684262ull;
|
|
||||||
- else
|
|
||||||
+ if (tx > 1152921504606846976ull) {
|
|
||||||
+ short_tx = tx / 115292150460684697ull;
|
|
||||||
+ Text = "EiB";
|
|
||||||
+ } else if (tx > 1125899906842624ull) {
|
|
||||||
short_tx /= 1125899906842624ull;
|
|
||||||
Text = "PiB";
|
|
||||||
} else if (tx > 1099511627776ull) {
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
diff --git a/netstat.c b/netstat.c
|
|
||||||
index c084dfb..cfcfb78 100644
|
|
||||||
--- a/netstat.c
|
|
||||||
+++ b/netstat.c
|
|
||||||
@@ -743,6 +743,7 @@ static void igmp_do_one(int lnr, const char *line,const char *prot)
|
|
||||||
static int igmp6_flag = 0;
|
|
||||||
static char device[16];
|
|
||||||
int num, idx, refcnt;
|
|
||||||
+ char* offset;
|
|
||||||
|
|
||||||
if (lnr == 0) {
|
|
||||||
/* IPV6 ONLY */
|
|
||||||
@@ -794,17 +795,21 @@ static void igmp_do_one(int lnr, const char *line,const char *prot)
|
|
||||||
#if HAVE_AFINET
|
|
||||||
if (line[0] != '\t') {
|
|
||||||
if (idx_flag) {
|
|
||||||
- if ((num = sscanf( line, "%d\t%10c", &idx, device)) < 2) {
|
|
||||||
+ if ((num = sscanf( line, "%d\t%15c", &idx, device)) < 2) {
|
|
||||||
fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
- if ( (num = sscanf( line, "%10c", device )) < 1 ) {
|
|
||||||
+ if ( (num = sscanf( line, "%15c", device )) < 1 ) {
|
|
||||||
fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- device[10] = '\0';
|
|
||||||
+
|
|
||||||
+ offset = strrchr(device, ':');
|
|
||||||
+ if(offset)
|
|
||||||
+ *offset = 0;
|
|
||||||
+
|
|
||||||
return;
|
|
||||||
} else if ( line[0] == '\t' ) {
|
|
||||||
if ( (num = sscanf(line, "\t%8[0-9A-Fa-f] %d", mcast_addr, &refcnt)) < 2 ) {
|
|
||||||
@@ -2037,7 +2037,7 @@ static int iface_info(void)
|
|
||||||
if (flag_exp < 2) {
|
|
||||||
ife_short = 1;
|
|
||||||
if(!(count % 8))
|
|
||||||
- printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
|
||||||
+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (flag_int_name) {
|
|
||||||
diff --git a/lib/interface.c b/lib/interface.c
|
|
||||||
index 3bd999f..97f3db5 100644
|
|
||||||
--- a/lib/interface.c
|
|
||||||
+++ b/lib/interface.c
|
|
||||||
@@ -655,7 +655,7 @@ int do_if_print(struct interface *ife, void *cookie)
|
|
||||||
|
|
||||||
void ife_print_short(struct interface *ptr)
|
|
||||||
{
|
|
||||||
- printf("%-8.8s ", ptr->name);
|
|
||||||
+ printf("%-15.15s ", ptr->name);
|
|
||||||
printf("%5d ", ptr->mtu);
|
|
||||||
/* If needed, display the interface statistics. */
|
|
||||||
if (ptr->statistics_valid) {
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -up net-tools-2.0/iptunnel.c.linux48 net-tools-2.0/iptunnel.c
|
|
||||||
--- net-tools-2.0/iptunnel.c.linux48 2016-02-15 16:54:18.000000000 +0100
|
|
||||||
+++ net-tools-2.0/iptunnel.c 2016-10-12 09:16:57.429279406 +0200
|
|
||||||
@@ -26,7 +26,7 @@
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
-#include <netinet/ip.h>
|
|
||||||
+#include <linux/ip.h>
|
|
||||||
#include <arpa/inet.h>
|
|
||||||
#include <net/if.h>
|
|
||||||
#include <net/if_arp.h>
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
diff --git a/man/en_US/netstat.8.old b/man/en_US/netstat.8
|
|
||||||
index f22c2c5..d78a54a 100644
|
|
||||||
--- a/man/en_US/netstat.8.old
|
|
||||||
+++ b/man/en_US/netstat.8
|
|
||||||
@@ -311,7 +311,37 @@ causes this column to be included. You will also need
|
|
||||||
privileges to see this information on sockets you don't own. This
|
|
||||||
identification information is not yet available for IPX sockets.
|
|
||||||
.SS "Timer"
|
|
||||||
-(this needs to be written)
|
|
||||||
+TCP timer associated with this socket. The format is timer(a/b/c). The timer is one of the following values:
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+off
|
|
||||||
+There is no timer set for this socket.
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+on
|
|
||||||
+The retransmission timer is active for the socket.
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+keepalive
|
|
||||||
+The keepalive timer is active for the socket.
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+timewait
|
|
||||||
+The connection is closing and the timewait timer is active for the socket.
|
|
||||||
+.P
|
|
||||||
+The values in the brackets:
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+a
|
|
||||||
+Timer value.
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+b
|
|
||||||
+Number of retransmissions sent.
|
|
||||||
+.TP
|
|
||||||
+.I
|
|
||||||
+c
|
|
||||||
+Number of keepalives sent.
|
|
||||||
.P
|
|
||||||
.SS Active UNIX domain Sockets
|
|
||||||
.SS "Proto"
|
|
||||||
@ -1,10 +1,10 @@
|
|||||||
Name: net-tools
|
Name: net-tools
|
||||||
Version: 2.0
|
Version: 2.10
|
||||||
Release: 0.55
|
Release: 1
|
||||||
Summary: Important Programs for Networking
|
Summary: Important Programs for Networking
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://sourceforge.net/projects/net-tools/
|
URL: https://sourceforge.net/projects/net-tools/
|
||||||
Source0: net-tools-115f1af2494ded1fcd21c8419d5e289bc4df380f.tar.xz
|
source0: https://sourceforge.net/projects/net-tools/files/%{name}-%{version}.tar.xz
|
||||||
Source1: net-tools-config.h
|
Source1: net-tools-config.h
|
||||||
Source2: net-tools-config.make
|
Source2: net-tools-config.make
|
||||||
Source3: ether-wake.c
|
Source3: ether-wake.c
|
||||||
@ -15,13 +15,9 @@ Source7: iptunnel.8
|
|||||||
Source8: ipmaddr.8
|
Source8: ipmaddr.8
|
||||||
Source9: arp-ethers.service
|
Source9: arp-ethers.service
|
||||||
|
|
||||||
Patch1: net-tools-cycle.patch
|
Patch1: backport-net-tools-cycle.patch
|
||||||
Patch2: net-tools-man.patch
|
Patch2: backport-net-tools-man.patch
|
||||||
Patch3: net-tools-linux48.patch
|
Patch3: backport-ether-wake-interfaces.patch
|
||||||
Patch20: ether-wake-interfaces.patch
|
|
||||||
Patch21: net-tools-ifconfig-EiB.patch
|
|
||||||
Patch22: net-tools-timer-man.patch
|
|
||||||
Patch23: net-tools-interface-name-len.patch
|
|
||||||
|
|
||||||
BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc
|
BuildRequires: bluez-libs-devel gettext, libselinux libselinux-devel systemd gcc
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
@ -35,7 +31,7 @@ and have been moved to net-tools-deprecated.
|
|||||||
%package_help
|
%package_help
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q
|
||||||
cp %SOURCE1 ./config.h
|
cp %SOURCE1 ./config.h
|
||||||
cp %SOURCE2 ./config.make
|
cp %SOURCE2 ./config.make
|
||||||
cp %SOURCE3 .
|
cp %SOURCE3 .
|
||||||
@ -46,11 +42,7 @@ cp %SOURCE7 ./man/en_US
|
|||||||
cp %SOURCE8 ./man/en_US
|
cp %SOURCE8 ./man/en_US
|
||||||
%patch1 -p1 -b .cycle
|
%patch1 -p1 -b .cycle
|
||||||
%patch2 -p1 -b .man
|
%patch2 -p1 -b .man
|
||||||
%patch3 -p1 -b .linux48
|
%patch3 -p1 -b .interfaces
|
||||||
%patch20 -p1 -b .interfaces
|
|
||||||
%patch21 -p1 -b .ifconfig-EiB
|
|
||||||
%patch22 -p1 -b .timer-man
|
|
||||||
%patch23 -p1 -b .interface-name-len
|
|
||||||
touch ./config.h
|
touch ./config.h
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -111,7 +103,13 @@ touch %{buildroot}%{_unitdir}/arp-ethers.service
|
|||||||
%exclude %{_mandir}/pt/man5
|
%exclude %{_mandir}/pt/man5
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
*Wed Sep 2 2020 zengwefeng<zwfeng@huawei.com> - 2.0-0.55
|
* Tue Dec 07 2021 gaihuiying<gaihuiying1@huawei.com> - 2.10-1
|
||||||
|
- Type:requirement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update net-tools to 2.10
|
||||||
|
|
||||||
|
* Wed Sep 2 2020 zengwefeng<zwfeng@huawei.com> - 2.0-0.55
|
||||||
- Type:NA
|
- Type:NA
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user