143 lines
5.4 KiB
Diff
143 lines
5.4 KiB
Diff
diff -up net-tools-1.60/arp.c.scanf-format net-tools-1.60/arp.c
|
|
--- net-tools-1.60/arp.c.scanf-format 2011-02-04 14:37:11.000000000 +0100
|
|
+++ net-tools-1.60/arp.c 2011-02-04 14:37:11.000000000 +0100
|
|
@@ -557,7 +557,7 @@ static int arp_show(char *name)
|
|
/* Read the ARP cache entries. */
|
|
for (num = 0; num < entries; num++) {
|
|
fgets(line, sizeof(line), fp);
|
|
- if (sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n",
|
|
+ if (sscanf(line, "%s 0x%x 0x%x %99s %99s %99s\n",
|
|
ip, &type, &flags, hwa, mask, dev) < 4)
|
|
break;
|
|
|
|
diff -up net-tools-1.60/lib/inet6_gr.c.scanf-format net-tools-1.60/lib/inet6_gr.c
|
|
--- net-tools-1.60/lib/inet6_gr.c.scanf-format 2011-02-04 14:37:11.000000000 +0100
|
|
+++ net-tools-1.60/lib/inet6_gr.c 2011-02-04 14:39:54.000000000 +0100
|
|
@@ -78,7 +78,7 @@ int rprint_fib6(int ext, int numeric)
|
|
"Flags Metric Ref Use Iface\n"));
|
|
|
|
while (fgets(buff, 1023, fp)) {
|
|
- num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %s\n",
|
|
+ num = sscanf(buff, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %02x %4s%4s%4s%4s%4s%4s%4s%4s %08x %08x %08x %08x %15s\n",
|
|
addr6p[0], addr6p[1], addr6p[2], addr6p[3],
|
|
addr6p[4], addr6p[5], addr6p[6], addr6p[7],
|
|
&prefix_len,
|
|
diff -up net-tools-1.60/lib/inet_gr.c.scanf-format net-tools-1.60/lib/inet_gr.c
|
|
--- net-tools-1.60/lib/inet_gr.c.scanf-format 2000-10-28 12:59:42.000000000 +0200
|
|
+++ net-tools-1.60/lib/inet_gr.c 2011-02-04 14:55:41.000000000 +0100
|
|
@@ -68,19 +68,19 @@ int rprint_fib(int ext, int numeric)
|
|
mss = 0;
|
|
|
|
fmt = proc_gen_fmt(_PATH_PROCNET_ROUTE, 0, fp,
|
|
- "Iface", "%16s",
|
|
- "Destination", "%128s",
|
|
- "Gateway", "%128s",
|
|
+ "Iface", "%15s",
|
|
+ "Destination", "%127s",
|
|
+ "Gateway", "%127s",
|
|
"Flags", "%X",
|
|
"RefCnt", "%d",
|
|
"Use", "%d",
|
|
"Metric", "%d",
|
|
- "Mask", "%128s",
|
|
+ "Mask", "%127s",
|
|
"MTU", "%d",
|
|
"Window", "%d",
|
|
"IRTT", "%d",
|
|
NULL);
|
|
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d\n" */
|
|
+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d\n" */
|
|
|
|
if (!fmt)
|
|
return 1;
|
|
@@ -268,21 +268,21 @@ int rprint_cache(int ext, int numeric)
|
|
"MSS Window irtt HH Arp\n"));
|
|
|
|
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
|
|
- "Iface", "%16s",
|
|
- "Destination", "%128s",
|
|
- "Gateway", "%128s",
|
|
+ "Iface", "%15s",
|
|
+ "Destination", "%127s",
|
|
+ "Gateway", "%127s",
|
|
"Flags", "%X",
|
|
"RefCnt", "%d",
|
|
"Use", "%d",
|
|
"Metric", "%d",
|
|
- "Source", "%128s",
|
|
+ "Source", "%127s",
|
|
"MTU", "%d",
|
|
"Window", "%d",
|
|
"IRTT", "%d",
|
|
"HH", "%d",
|
|
"ARP", "%d",
|
|
NULL);
|
|
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d\n" */
|
|
+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d\n" */
|
|
}
|
|
|
|
if (format == 2) {
|
|
@@ -291,23 +291,23 @@ int rprint_cache(int ext, int numeric)
|
|
"Flags Metric Ref Use Iface "
|
|
"MSS Window irtt TOS HHRef HHUptod SpecDst\n"));
|
|
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
|
|
- "Iface", "%16s",
|
|
- "Destination", "%128s",
|
|
- "Gateway", "%128s",
|
|
+ "Iface", "%15s",
|
|
+ "Destination", "%127s",
|
|
+ "Gateway", "%127s",
|
|
"Flags", "%X",
|
|
"RefCnt", "%d",
|
|
"Use", "%d",
|
|
"Metric", "%d",
|
|
- "Source", "%128s",
|
|
+ "Source", "%127s",
|
|
"MTU", "%d",
|
|
"Window", "%d",
|
|
"IRTT", "%d",
|
|
"TOS", "%d",
|
|
"HHRef", "%d",
|
|
"HHUptod", "%d",
|
|
- "SpecDst", "%128s",
|
|
+ "SpecDst", "%127s",
|
|
NULL);
|
|
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d %128s\n" */
|
|
+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d %127s\n" */
|
|
}
|
|
|
|
|
|
diff -up net-tools-1.60/lib/interface.c.scanf-format net-tools-1.60/lib/interface.c
|
|
--- net-tools-1.60/lib/interface.c.scanf-format 2011-02-04 14:37:11.000000000 +0100
|
|
+++ net-tools-1.60/lib/interface.c 2011-02-04 14:37:11.000000000 +0100
|
|
@@ -713,7 +713,7 @@ void ife_print_long(struct interface *pt
|
|
#endif
|
|
#if HAVE_AFINET6
|
|
FILE *f;
|
|
- char addr6[40], devname[20];
|
|
+ char addr6[40], devname[21];
|
|
struct sockaddr_in6 sap;
|
|
int plen, scope, dad_status, if_idx;
|
|
extern struct aftype inet6_aftype;
|
|
diff -up net-tools-1.60/netstat.c.scanf-format net-tools-1.60/netstat.c
|
|
--- net-tools-1.60/netstat.c.scanf-format 2011-02-04 14:37:11.000000000 +0100
|
|
+++ net-tools-1.60/netstat.c 2011-02-04 14:37:11.000000000 +0100
|
|
@@ -1103,7 +1103,7 @@ static void udp_do_one(int lnr, const ch
|
|
|
|
more[0] = '\0';
|
|
num = sscanf(line,
|
|
- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
|
|
+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %511s\n",
|
|
&d, local_addr, &local_port,
|
|
rem_addr, &rem_port, &state,
|
|
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
|
|
@@ -1536,7 +1536,7 @@ static void raw_do_one(int lnr, const ch
|
|
|
|
more[0] = '\0';
|
|
num = sscanf(line,
|
|
- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n",
|
|
+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %511s\n",
|
|
&d, local_addr, &local_port, rem_addr, &rem_port, &state,
|
|
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
|
|
|