diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 14:16:39 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 14:16:39 +0000 |
| commit | a27a11bb2c033d3e0312dc1d62430a002314686f (patch) | |
| tree | 74b32a18cb1e09c4f663a49c27ffa3725d3e4ee5 /networking/nc_bloaty.c | |
| parent | b98c26ad684e3aed8f1480458737f1ab90477c9e (diff) | |
| download | busybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.tar.gz busybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.tar.bz2 busybox-w32-a27a11bb2c033d3e0312dc1d62430a002314686f.zip | |
introduce and use xdup2(int, int)
stop checking whether setsockopt_reuseaddr(int fd) was successful (it always is)
remove second parameter (sockllen) from xmalloc_sockaddr2xxxxx functions
sockaddr2str 142 156 +14
collect_blk 467 474 +7
xdup2 28 33 +5
singlemount 4456 4454 -2
print_host 214 212 -2
nslookup_main 139 137 -2
ftpgetput_main 414 412 -2
udhcpd_main 1258 1255 -3
udhcpc_main 2405 2402 -3
traceroute_main 4125 4122 -3
nc_main 1072 1069 -3
buffer_fill_and_print 76 73 -3
xmalloc_sockaddr2hostonly_noport 18 14 -4
xmalloc_sockaddr2host_noport 18 14 -4
xmalloc_sockaddr2host 15 11 -4
xmalloc_sockaddr2dotted_noport 18 14 -4
xmalloc_sockaddr2dotted 18 14 -4
wget_main 2618 2614 -4
ping_main 393 389 -4
ip_port_str 120 115 -5
dhcprelay_main 1146 1141 -5
dnsd_main 1531 1525 -6
passwd_main 1110 1102 -8
udhcp_kernel_packet 206 197 -9
udhcp_listen_socket 154 144 -10
getty_main 2576 2566 -10
setup 655 640 -15
xmove_fd 51 34 -17
dolisten 759 742 -17
tcpudpsvd_main 1866 1836 -30
startservice 339 299 -40
Diffstat (limited to 'networking/nc_bloaty.c')
| -rw-r--r-- | networking/nc_bloaty.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c index 0d1071499..30abb3c1c 100644 --- a/networking/nc_bloaty.c +++ b/networking/nc_bloaty.c | |||
| @@ -278,7 +278,7 @@ static void dolisten(void) | |||
| 278 | rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len); | 278 | rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len); |
| 279 | if (rr < 0) | 279 | if (rr < 0) |
| 280 | bb_perror_msg_and_die("getsockname after bind"); | 280 | bb_perror_msg_and_die("getsockname after bind"); |
| 281 | addr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len); | 281 | addr = xmalloc_sockaddr2dotted(&ouraddr->sa); |
| 282 | fprintf(stderr, "listening on %s ...\n", addr); | 282 | fprintf(stderr, "listening on %s ...\n", addr); |
| 283 | free(addr); | 283 | free(addr); |
| 284 | } | 284 | } |
| @@ -341,7 +341,7 @@ create new one, and bind() it. TODO */ | |||
| 341 | /* nc 1.10 bails out instead, and its error message | 341 | /* nc 1.10 bails out instead, and its error message |
| 342 | * is not suppressed by o_verbose */ | 342 | * is not suppressed by o_verbose */ |
| 343 | if (o_verbose) { | 343 | if (o_verbose) { |
| 344 | char *remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len); | 344 | char *remaddr = xmalloc_sockaddr2dotted(&remend.sa); |
| 345 | bb_error_msg("connect from wrong ip/port %s ignored", remaddr); | 345 | bb_error_msg("connect from wrong ip/port %s ignored", remaddr); |
| 346 | free(remaddr); | 346 | free(remaddr); |
| 347 | } | 347 | } |
| @@ -393,9 +393,9 @@ create new one, and bind() it. TODO */ | |||
| 393 | accept the connection and then reject undesireable ones by closing. | 393 | accept the connection and then reject undesireable ones by closing. |
| 394 | In other words, we need a TCP MSG_PEEK. */ | 394 | In other words, we need a TCP MSG_PEEK. */ |
| 395 | /* bbox: removed most of it */ | 395 | /* bbox: removed most of it */ |
| 396 | lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len); | 396 | lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa); |
| 397 | remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len); | 397 | remaddr = xmalloc_sockaddr2dotted(&remend.sa); |
| 398 | remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa, remend.len); | 398 | remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa); |
| 399 | fprintf(stderr, "connect to %s from %s (%s)\n", | 399 | fprintf(stderr, "connect to %s from %s (%s)\n", |
| 400 | lcladdr, remhostname, remaddr); | 400 | lcladdr, remhostname, remaddr); |
| 401 | free(lcladdr); | 401 | free(lcladdr); |
| @@ -796,7 +796,7 @@ int nc_main(int argc, char **argv) | |||
| 796 | 796 | ||
| 797 | remend = *themaddr; | 797 | remend = *themaddr; |
| 798 | if (o_verbose) | 798 | if (o_verbose) |
| 799 | themdotted = xmalloc_sockaddr2dotted(&themaddr->sa, themaddr->len); | 799 | themdotted = xmalloc_sockaddr2dotted(&themaddr->sa); |
| 800 | 800 | ||
| 801 | x = connect_w_timeout(netfd); | 801 | x = connect_w_timeout(netfd); |
| 802 | if (o_zero && x == 0 && o_udpmode) /* if UDP scanning... */ | 802 | if (o_zero && x == 0 && o_udpmode) /* if UDP scanning... */ |