aboutsummaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/libbb.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 52bc33940..651c48ba1 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -241,6 +241,7 @@ extern char *bb_get_last_path_component(char *path);
241 241
242int ndelay_on(int fd); 242int ndelay_on(int fd);
243int ndelay_off(int fd); 243int ndelay_off(int fd);
244void xdup2(int, int);
244void xmove_fd(int, int); 245void xmove_fd(int, int);
245 246
246 247
@@ -288,8 +289,7 @@ ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
288 * time out. Linux does not allow multiple live binds on same ip:port 289 * time out. Linux does not allow multiple live binds on same ip:port
289 * regardless of SO_REUSEADDR (unlike some other flavors of Unix). 290 * regardless of SO_REUSEADDR (unlike some other flavors of Unix).
290 * Turn it on before you call bind(). */ 291 * Turn it on before you call bind(). */
291//TODO: it seems like in Linux this never fails. Change to void, eliminate error checks 292void setsockopt_reuseaddr(int fd); /* On Linux this never fails. */
292int setsockopt_reuseaddr(int fd);
293int setsockopt_broadcast(int fd); 293int setsockopt_broadcast(int fd);
294/* NB: returns port in host byte order */ 294/* NB: returns port in host byte order */
295unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port); 295unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port);
@@ -360,14 +360,14 @@ void set_nport(len_and_sockaddr *lsa, unsigned port);
360/* Retrieve sin[6]_port or return -1 for non-INET[6] lsa's */ 360/* Retrieve sin[6]_port or return -1 for non-INET[6] lsa's */
361int get_nport(const struct sockaddr *sa); 361int get_nport(const struct sockaddr *sa);
362/* Reverse DNS. Returns NULL on failure. */ 362/* Reverse DNS. Returns NULL on failure. */
363char* xmalloc_sockaddr2host(const struct sockaddr *sa, socklen_t salen); 363char* xmalloc_sockaddr2host(const struct sockaddr *sa);
364/* This one doesn't append :PORTNUM */ 364/* This one doesn't append :PORTNUM */
365char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa, socklen_t salen); 365char* xmalloc_sockaddr2host_noport(const struct sockaddr *sa);
366/* This one also doesn't fall back to dotted IP (returns NULL) */ 366/* This one also doesn't fall back to dotted IP (returns NULL) */
367char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa, socklen_t salen); 367char* xmalloc_sockaddr2hostonly_noport(const struct sockaddr *sa);
368/* inet_[ap]ton on steroids */ 368/* inet_[ap]ton on steroids */
369char* xmalloc_sockaddr2dotted(const struct sockaddr *sa, socklen_t salen); 369char* xmalloc_sockaddr2dotted(const struct sockaddr *sa);
370char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa, socklen_t salen); 370char* xmalloc_sockaddr2dotted_noport(const struct sockaddr *sa);
371// "old" (ipv4 only) API 371// "old" (ipv4 only) API
372// users: traceroute.c hostname.c - use _list_ of all IPs 372// users: traceroute.c hostname.c - use _list_ of all IPs
373struct hostent *xgethostbyname(const char *name); 373struct hostent *xgethostbyname(const char *name);