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/udhcp/packet.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/udhcp/packet.c')
-rw-r--r-- | networking/udhcp/packet.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c index 272e79df1..41cd32135 100644 --- a/networking/udhcp/packet.c +++ b/networking/udhcp/packet.c | |||
@@ -194,17 +194,14 @@ int udhcp_kernel_packet(struct dhcpMessage *payload, | |||
194 | if (fd < 0) | 194 | if (fd < 0) |
195 | return -1; | 195 | return -1; |
196 | 196 | ||
197 | if (setsockopt_reuseaddr(fd) == -1) { | 197 | setsockopt_reuseaddr(fd); |
198 | close(fd); | ||
199 | return -1; | ||
200 | } | ||
201 | 198 | ||
202 | memset(&client, 0, sizeof(client)); | 199 | memset(&client, 0, sizeof(client)); |
203 | client.sin_family = AF_INET; | 200 | client.sin_family = AF_INET; |
204 | client.sin_port = htons(source_port); | 201 | client.sin_port = htons(source_port); |
205 | client.sin_addr.s_addr = source_ip; | 202 | client.sin_addr.s_addr = source_ip; |
206 | 203 | ||
207 | if (bind(fd, (struct sockaddr *)&client, sizeof(struct sockaddr)) == -1) { | 204 | if (bind(fd, (struct sockaddr *)&client, sizeof(client)) == -1) { |
208 | close(fd); | 205 | close(fd); |
209 | return -1; | 206 | return -1; |
210 | } | 207 | } |