summaryrefslogtreecommitdiff
path: root/networking/route.c
diff options
context:
space:
mode:
authorDenis Vlasenko2007-06-19 11:12:46 +0000
committerDenis Vlasenko2007-06-19 11:12:46 +0000
commit6d9ea24611090f06b74e0e5b038b6c5b4bbe1063 (patch)
tree7fbefb532c3412b0264a9faf7d0ad3f42254b86e /networking/route.c
parent1b16bdaebf7d0e543e048dfec9f34f06e983336c (diff)
downloadbusybox-6d9ea24611090f06b74e0e5b038b6c5b4bbe1063.zip
busybox-6d9ea24611090f06b74e0e5b038b6c5b4bbe1063.tar.gz
networking/interface.c: huke remaining big statics; use malloc for INET[6]_rresolve
return value. Went thru callers and adjusted them - code got smaller too. function old new delta ip_port_str - 126 +126 INET6_rresolve 165 182 +17 static.cache 20 24 +4 route_main 2092 2091 -1 INET_sprint 61 59 -2 INET_nn 4 - -4 INET6_sprint 59 53 -6 udp_do_one 518 508 -10 tcp_do_one 433 423 -10 raw_do_one 494 484 -10 traceroute_main 4117 4105 -12 INET_rresolve 334 321 -13 bb_displayroutes 494 456 -38 snprint_ip_port 244 - -244 static.buff 264 16 -248 ------------------------------------------------------------------------------ (add/remove: 1/2 grow/shrink: 2/10 up/down: 147/-598) Total: -451 bytes size busybox_old busybox_unstripped text data bss dec hex filename 751073 3048 14688 768809 bbb29 busybox_old 750873 3048 14440 768361 bb969 busybox_unstripped
Diffstat (limited to 'networking/route.c')
-rw-r--r--networking/route.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/networking/route.c b/networking/route.c
index 881332b..b5490dd 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -478,7 +478,7 @@ static void set_flags(char *flagstr, int flags)
/* also used in netstat */
void bb_displayroutes(int noresolve, int netstatfmt)
{
- char devname[64], flags[16], sdest[16], sgw[16];
+ char devname[64], flags[16], *sdest, *sgw;
unsigned long d, g, m;
int flgs, ref, use, metric, mtu, win, ir;
struct sockaddr_in s_addr;
@@ -520,15 +520,14 @@ void bb_displayroutes(int noresolve, int netstatfmt)
memset(&s_addr, 0, sizeof(struct sockaddr_in));
s_addr.sin_family = AF_INET;
s_addr.sin_addr.s_addr = d;
- INET_rresolve(sdest, sizeof(sdest), &s_addr,
- (noresolve | 0x8000), m); /* Default instead of *. */
-
+ sdest = INET_rresolve(&s_addr, (noresolve | 0x8000), m); /* 'default' instead of '*' */
s_addr.sin_addr.s_addr = g;
- INET_rresolve(sgw, sizeof(sgw), &s_addr,
- (noresolve | 0x4000), m); /* Host instead of net. */
-
+ sgw = INET_rresolve(&s_addr, (noresolve | 0x4000), m); /* Host instead of net */
mask.s_addr = m;
- printf("%-16s%-16s%-16s%-6s", sdest, sgw, inet_ntoa(mask), flags);
+ /* "%15.15s" truncates hostnames, do we really want that? */
+ printf("%-15.15s %-15.15s %-16s%-6s", sdest, sgw, inet_ntoa(mask), flags);
+ free(sdest);
+ free(sgw);
if (netstatfmt) {
printf("%5d %-5d %6d %s\n", mtu, win, ir, devname);
} else {
@@ -541,7 +540,7 @@ void bb_displayroutes(int noresolve, int netstatfmt)
static void INET6_displayroutes(int noresolve)
{
- char addr6[128], naddr6[128];
+ char addr6[128], *naddr6;
/* In addr6x, we store both 40-byte ':'-delimited ipv6 addresses.
* We read the non-delimited strings into the tail of the buffer
* using fscanf and then modify the buffer by shifting forward
@@ -581,7 +580,7 @@ static void INET6_displayroutes(int noresolve)
do {
if (!*p) {
- if (i==40) { /* nul terminator for 1st address? */
+ if (i == 40) { /* nul terminator for 1st address? */
addr6x[39] = 0; /* Fixup... need 0 instead of ':'. */
++p; /* Skip and continue. */
continue;
@@ -606,18 +605,19 @@ static void INET6_displayroutes(int noresolve)
inet_pton(AF_INET6, addr6x + r,
(struct sockaddr *) &snaddr6.sin6_addr);
snaddr6.sin6_family = AF_INET6;
- INET6_rresolve(naddr6, sizeof(naddr6),
- (struct sockaddr_in6 *) &snaddr6,
+ naddr6 = INET6_rresolve((struct sockaddr_in6 *) &snaddr6,
0x0fff /* Apparently, upstream never resolves. */
);
if (!r) { /* 1st pass */
snprintf(addr6, sizeof(addr6), "%s/%d", naddr6, prefix_len);
r += 40;
+ free(naddr6);
} else { /* 2nd pass */
/* Print the info. */
printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
- addr6, naddr6, flags, metric, refcnt, use, iface);
+ addr6, naddr6, flags, metric, refcnt, use, iface);
+ free(naddr6);
break;
}
} while (1);