| 1 |
diff -up net-tools-1.60/arp.c.scanf-format net-tools-1.60/arp.c |
| 2 |
--- net-tools-1.60/arp.c.scanf-format 2009-07-08 11:17:09.000000000 +0200 |
| 3 |
+++ net-tools-1.60/arp.c 2009-07-08 11:43:39.000000000 +0200 |
| 4 |
@@ -557,7 +557,7 @@ static int arp_show(char *name) |
| 5 |
/* Read the ARP cache entries. */ |
| 6 |
for (num = 0; num < entries; num++) { |
| 7 |
fgets(line, sizeof(line), fp); |
| 8 |
- if (sscanf(line, "%s 0x%x 0x%x %100s %100s %100s\n", |
| 9 |
+ if (sscanf(line, "%s 0x%x 0x%x %99s %99s %99s\n", |
| 10 |
ip, &type, &flags, hwa, mask, dev) < 4) |
| 11 |
break; |
| 12 |
|
| 13 |
diff -up net-tools-1.60/lib/inet_gr.c.scanf-format net-tools-1.60/lib/inet_gr.c |
| 14 |
--- net-tools-1.60/lib/inet_gr.c.scanf-format 2000-10-28 12:59:42.000000000 +0200 |
| 15 |
+++ net-tools-1.60/lib/inet_gr.c 2009-07-08 11:49:59.000000000 +0200 |
| 16 |
@@ -38,7 +38,7 @@ extern char *INET_sprintmask(struct sock |
| 17 |
|
| 18 |
int rprint_fib(int ext, int numeric) |
| 19 |
{ |
| 20 |
- char buff[1024], iface[16], flags[64]; |
| 21 |
+ char buff[1024], iface[17], flags[64]; |
| 22 |
char gate_addr[128], net_addr[128]; |
| 23 |
char mask_addr[128]; |
| 24 |
int num, iflags, metric, refcnt, use, mss, window, irtt; |
| 25 |
@@ -69,18 +69,18 @@ int rprint_fib(int ext, int numeric) |
| 26 |
|
| 27 |
fmt = proc_gen_fmt(_PATH_PROCNET_ROUTE, 0, fp, |
| 28 |
"Iface", "%16s", |
| 29 |
- "Destination", "%128s", |
| 30 |
- "Gateway", "%128s", |
| 31 |
+ "Destination", "%127s", |
| 32 |
+ "Gateway", "%127s", |
| 33 |
"Flags", "%X", |
| 34 |
"RefCnt", "%d", |
| 35 |
"Use", "%d", |
| 36 |
"Metric", "%d", |
| 37 |
- "Mask", "%128s", |
| 38 |
+ "Mask", "%127s", |
| 39 |
"MTU", "%d", |
| 40 |
"Window", "%d", |
| 41 |
"IRTT", "%d", |
| 42 |
NULL); |
| 43 |
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d\n" */ |
| 44 |
+ /* "%16s %127s %127s %X %d %d %d %127s %d %d %d\n" */ |
| 45 |
|
| 46 |
if (!fmt) |
| 47 |
return 1; |
| 48 |
@@ -205,7 +205,7 @@ int rprint_fib(int ext, int numeric) |
| 49 |
|
| 50 |
int rprint_cache(int ext, int numeric) |
| 51 |
{ |
| 52 |
- char buff[1024], iface[16], flags[64]; |
| 53 |
+ char buff[1024], iface[17], flags[64]; |
| 54 |
char gate_addr[128], dest_addr[128], specdst[128]; |
| 55 |
char src_addr[128]; |
| 56 |
struct sockaddr snet; |
| 57 |
@@ -269,20 +269,20 @@ int rprint_cache(int ext, int numeric) |
| 58 |
|
| 59 |
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp, |
| 60 |
"Iface", "%16s", |
| 61 |
- "Destination", "%128s", |
| 62 |
- "Gateway", "%128s", |
| 63 |
+ "Destination", "%127s", |
| 64 |
+ "Gateway", "%127s", |
| 65 |
"Flags", "%X", |
| 66 |
"RefCnt", "%d", |
| 67 |
"Use", "%d", |
| 68 |
"Metric", "%d", |
| 69 |
- "Source", "%128s", |
| 70 |
+ "Source", "%127s", |
| 71 |
"MTU", "%d", |
| 72 |
"Window", "%d", |
| 73 |
"IRTT", "%d", |
| 74 |
"HH", "%d", |
| 75 |
"ARP", "%d", |
| 76 |
NULL); |
| 77 |
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d\n" */ |
| 78 |
+ /* "%16s %127s %127s %X %d %d %d %127s %d %d %d %d %d\n" */ |
| 79 |
} |
| 80 |
|
| 81 |
if (format == 2) { |
| 82 |
@@ -292,13 +292,13 @@ int rprint_cache(int ext, int numeric) |
| 83 |
"MSS Window irtt TOS HHRef HHUptod SpecDst\n")); |
| 84 |
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp, |
| 85 |
"Iface", "%16s", |
| 86 |
- "Destination", "%128s", |
| 87 |
- "Gateway", "%128s", |
| 88 |
+ "Destination", "%127s", |
| 89 |
+ "Gateway", "%127s", |
| 90 |
"Flags", "%X", |
| 91 |
"RefCnt", "%d", |
| 92 |
"Use", "%d", |
| 93 |
"Metric", "%d", |
| 94 |
- "Source", "%128s", |
| 95 |
+ "Source", "%127s", |
| 96 |
"MTU", "%d", |
| 97 |
"Window", "%d", |
| 98 |
"IRTT", "%d", |
| 99 |
@@ -307,7 +307,7 @@ int rprint_cache(int ext, int numeric) |
| 100 |
"HHUptod", "%d", |
| 101 |
"SpecDst", "%128s", |
| 102 |
NULL); |
| 103 |
- /* "%16s %128s %128s %X %d %d %d %128s %d %d %d %d %d %128s\n" */ |
| 104 |
+ /* "%16s %127s %127s %X %d %d %d %127s %d %d %d %d %d %128s\n" */ |
| 105 |
} |
| 106 |
|
| 107 |
|
| 108 |
diff -up net-tools-1.60/lib/interface.c.scanf-format net-tools-1.60/lib/interface.c |
| 109 |
--- net-tools-1.60/lib/interface.c.scanf-format 2009-07-08 11:17:09.000000000 +0200 |
| 110 |
+++ net-tools-1.60/lib/interface.c 2009-07-08 11:45:44.000000000 +0200 |
| 111 |
@@ -713,7 +713,7 @@ void ife_print_long(struct interface *pt |
| 112 |
#endif |
| 113 |
#if HAVE_AFINET6 |
| 114 |
FILE *f; |
| 115 |
- char addr6[40], devname[20]; |
| 116 |
+ char addr6[40], devname[21]; |
| 117 |
struct sockaddr_in6 sap; |
| 118 |
int plen, scope, dad_status, if_idx; |
| 119 |
extern struct aftype inet6_aftype; |
| 120 |
diff -up net-tools-1.60/netstat.c.scanf-format net-tools-1.60/netstat.c |
| 121 |
--- net-tools-1.60/netstat.c.scanf-format 2009-07-08 11:17:09.000000000 +0200 |
| 122 |
+++ net-tools-1.60/netstat.c 2009-07-08 11:42:12.000000000 +0200 |
| 123 |
@@ -1105,7 +1105,7 @@ static void udp_do_one(int lnr, const ch |
| 124 |
|
| 125 |
more[0] = '\0'; |
| 126 |
num = sscanf(line, |
| 127 |
- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", |
| 128 |
+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %511s\n", |
| 129 |
&d, local_addr, &local_port, |
| 130 |
rem_addr, &rem_port, &state, |
| 131 |
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); |
| 132 |
@@ -1540,7 +1540,7 @@ static void raw_do_one(int lnr, const ch |
| 133 |
|
| 134 |
more[0] = '\0'; |
| 135 |
num = sscanf(line, |
| 136 |
- "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %512s\n", |
| 137 |
+ "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %511s\n", |
| 138 |
&d, local_addr, &local_port, rem_addr, &rem_port, &state, |
| 139 |
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more); |
| 140 |
|
Parent Directory
| 
Revision Log