summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenis Vlasenko2007-04-02 12:37:28 +0000
committerDenis Vlasenko2007-04-02 12:37:28 +0000
commit729bd9e0b0d5977e9c2c2a4eff7e2f0ca2ad4b9e (patch)
treed5cb1a1c7c41b2681ca867c57c3b4e473c0a56be /libbb
parentb05a939bcc0249fe8bd94b9795db8f8d93c3921e (diff)
downloadbusybox-729bd9e0b0d5977e9c2c2a4eff7e2f0ca2ad4b9e.zip
busybox-729bd9e0b0d5977e9c2c2a4eff7e2f0ca2ad4b9e.tar.gz
test: comment out unused code
udpsvd: fake it compile tcpsvd: more optimal memorizing of IP's for -C
Diffstat (limited to 'libbb')
-rw-r--r--libbb/xconnect.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index a331e6b..3c1eec9 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -208,7 +208,7 @@ len_and_sockaddr* xdotted2sockaddr(const char *host, int port)
return str2sockaddr(host, port, AF_UNSPEC, AI_NUMERICHOST | DIE_ON_ERROR);
}
-int xsocket_stream(len_and_sockaddr **lsap)
+static int xsocket_type(len_and_sockaddr **lsap, int sock_type)
{
len_and_sockaddr *lsa;
int fd;
@@ -216,14 +216,14 @@ int xsocket_stream(len_and_sockaddr **lsap)
int family = AF_INET;
#if ENABLE_FEATURE_IPV6
- fd = socket(AF_INET6, SOCK_STREAM, 0);
+ fd = socket(AF_INET6, sock_type, 0);
if (fd >= 0) {
len = sizeof(struct sockaddr_in6);
family = AF_INET6;
} else
#endif
{
- fd = xsocket(AF_INET, SOCK_STREAM, 0);
+ fd = xsocket(AF_INET, sock_type, 0);
}
lsa = xzalloc(offsetof(len_and_sockaddr, sa) + len);
lsa->len = len;
@@ -232,7 +232,12 @@ int xsocket_stream(len_and_sockaddr **lsap)
return fd;
}
-int create_and_bind_stream_or_die(const char *bindaddr, int port)
+int xsocket_stream(len_and_sockaddr **lsap)
+{
+ return xsocket_type(lsap, SOCK_STREAM);
+}
+
+static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
{
int fd;
len_and_sockaddr *lsa;
@@ -240,9 +245,9 @@ int create_and_bind_stream_or_die(const char *bindaddr, int port)
if (bindaddr && bindaddr[0]) {
lsa = xdotted2sockaddr(bindaddr, port);
/* user specified bind addr dictates family */
- fd = xsocket(lsa->sa.sa_family, SOCK_STREAM, 0);
+ fd = xsocket(lsa->sa.sa_family, sock_type, 0);
} else {
- fd = xsocket_stream(&lsa);
+ fd = xsocket_type(&lsa, sock_type);
set_nport(lsa, htons(port));
}
setsockopt_reuseaddr(fd);
@@ -251,6 +256,17 @@ int create_and_bind_stream_or_die(const char *bindaddr, int port)
return fd;
}
+int create_and_bind_stream_or_die(const char *bindaddr, int port)
+{
+ return create_and_bind_or_die(bindaddr, port, SOCK_STREAM);
+}
+
+int create_and_bind_dgram_or_die(const char *bindaddr, int port)
+{
+ return create_and_bind_or_die(bindaddr, port, SOCK_DGRAM);
+}
+
+
int create_and_connect_stream_or_die(const char *peer, int port)
{
int fd;