aboutsummaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-08-18 14:16:39 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-08-18 14:16:39 +0000
commita27a11bb2c033d3e0312dc1d62430a002314686f (patch)
tree74b32a18cb1e09c4f663a49c27ffa3725d3e4ee5 /libbb
parentb98c26ad684e3aed8f1480458737f1ab90477c9e (diff)
downloadbusybox-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 'libbb')
-rw-r--r--libbb/xconnect.c38
-rw-r--r--libbb/xfuncs.c9
2 files changed, 31 insertions, 16 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index b90aa9add..cb5ac2c8e 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -9,9 +9,9 @@
9#include <netinet/in.h> 9#include <netinet/in.h>
10#include "libbb.h" 10#include "libbb.h"
11 11
12int setsockopt_reuseaddr(int fd) 12void setsockopt_reuseaddr(int fd)
13{ 13{
14 return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &const_int_1, sizeof(const_int_1)); 14 setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &const_int_1, sizeof(const_int_1));
15} 15}
16int setsockopt_broadcast(int fd) 16int setsockopt_broadcast(int fd)
17{ 17{
@@ -298,11 +298,21 @@ int xconnect_stream(const len_and_sockaddr *lsa)
298/* We hijack this constant to mean something else */ 298/* We hijack this constant to mean something else */
299/* It doesn't hurt because we will add this bit anyway */ 299/* It doesn't hurt because we will add this bit anyway */
300#define IGNORE_PORT NI_NUMERICSERV 300#define IGNORE_PORT NI_NUMERICSERV
301static char* sockaddr2str(const struct sockaddr *sa, socklen_t salen, int flags) 301static char* sockaddr2str(const struct sockaddr *sa, int flags)
302{ 302{
303 char host[128]; 303 char host[128];
304 char serv[16]; 304 char serv[16];
305 int rc = getnameinfo(sa, salen, 305 int rc;
306 socklen_t salen;
307
308 salen = LSA_SIZEOF_SA;
309#if ENABLE_FEATURE_IPV6
310 if (sa->sa_family == AF_INET)
311 salen = sizeof(struct sockaddr_in);
312 if (sa->sa_family == AF_INET6)
313 salen = sizeof(struct sockaddr_in6);
314#endif
315 rc = getnameinfo(sa, salen,
306 host, sizeof(host), 316 host, sizeof(host),
307 /* can do ((flags & IGNORE_PORT) ? NULL : serv) but why bother? */ 317 /* can do ((flags & IGNORE_PORT) ? NULL : serv) but why bother? */
308 serv, sizeof(serv), 318 serv, sizeof(serv),
@@ -327,26 +337,26 @@ static char* sockaddr2str(const struct sockaddr *sa, socklen_t salen, int flags)
327 /*return xstrdup(host);*/ 337 /*return xstrdup(host);*/
328} 338}
329 339
330char* xmalloc_sockaddr2host(const struct sockaddr *sa, socklen_t salen) 340char* xmalloc_sockaddr2host(const struct sockaddr *sa)
331{ 341{
332 return sockaddr2str(sa, salen, 0); 342 return sockaddr2str(sa, 0);
333} 343}
334 344
335char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen) 345char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa)
336{ 346{
337 return sockaddr2str(sa, salen, IGNORE_PORT); 347 return sockaddr2str(sa, IGNORE_PORT);
338} 348}
339 349
340char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen) 350char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa)
341{ 351{
342 return sockaddr2str(sa, salen, NI_NAMEREQD | IGNORE_PORT); 352 return sockaddr2str(sa, NI_NAMEREQD | IGNORE_PORT);
343} 353}
344char* xmalloc_sockaddr2dotted(const struct sockaddr *sa, socklen_t salen) 354char* xmalloc_sockaddr2dotted(const struct sockaddr *sa)
345{ 355{
346 return sockaddr2str(sa, salen, NI_NUMERICHOST); 356 return sockaddr2str(sa, NI_NUMERICHOST);
347} 357}
348 358
349char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa, socklen_t salen) 359char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa)
350{ 360{
351 return sockaddr2str(sa, salen, NI_NUMERICHOST | IGNORE_PORT); 361 return sockaddr2str(sa, NI_NUMERICHOST | IGNORE_PORT);
352} 362}
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 64061e4f0..5a1090eaf 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -169,13 +169,18 @@ int ndelay_off(int fd)
169 return fcntl(fd, F_SETFL, fcntl(fd,F_GETFL,0) & ~O_NONBLOCK); 169 return fcntl(fd, F_SETFL, fcntl(fd,F_GETFL,0) & ~O_NONBLOCK);
170} 170}
171 171
172void xdup2(int from, int to)
173{
174 if (dup2(from, to) != to)
175 bb_perror_msg_and_die("can't duplicate file descriptor");
176}
177
172// "Renumber" opened fd 178// "Renumber" opened fd
173void xmove_fd(int from, int to) 179void xmove_fd(int from, int to)
174{ 180{
175 if (from == to) 181 if (from == to)
176 return; 182 return;
177 if (dup2(from, to) != to) 183 xdup2(from, to);
178 bb_perror_msg_and_die("can't duplicate file descriptor");
179 close(from); 184 close(from);
180} 185}
181 186
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-25 23:17:51 +0000