X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fxconnect.c;h=bc0691531dbba55056e912ab768b3ecd0c20c8b9;hb=666da5e2c6edec979966d16771818b32dcfafe04;hp=21ec2761af9468f0da92bbfeb50cf9fc39c35583;hpb=89f0b3486dfea233e6000f9af95b39a3ea7fd96e;p=oweals%2Fbusybox.git

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 21ec2761a..bc0691531 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -54,7 +54,8 @@ void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
 	if (connect(s, s_addr, addrlen) < 0) {
 		if (ENABLE_FEATURE_CLEAN_UP) close(s);
 		if (s_addr->sa_family == AF_INET)
-			bb_perror_msg_and_die("cannot connect to remote host (%s)",
+			bb_perror_msg_and_die("%s (%s)",
+				"cannot connect to remote host",
 				inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
 		bb_perror_msg_and_die("cannot connect to remote host");
 	}
@@ -66,3 +67,88 @@ int xconnect_tcp_v4(struct sockaddr_in *s_addr)
 	xconnect(s, (struct sockaddr*) s_addr, sizeof(*s_addr));
 	return s;
 }
+
+static const int one = 1;
+int setsockopt_reuseaddr(int fd)
+{
+	return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+}
+int setsockopt_broadcast(int fd)
+{
+	return setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one));
+}
+
+int dotted2sockaddr(const char *dotted, struct sockaddr* sp, int socklen)
+{
+	union {
+		struct in_addr a4;
+#if ENABLE_FEATURE_IPV6
+		struct in6_addr a6;
+#endif
+	} a;
+
+	/* TODO maybe: port spec? like n.n.n.n:nn */
+
+#if ENABLE_FEATURE_IPV6
+	if (socklen >= sizeof(struct sockaddr_in6)
+	 && inet_pton(AF_INET6, dotted, &a.a6) > 0
+	) {
+		((struct sockaddr_in6*)sp)->sin6_family = AF_INET6;
+		((struct sockaddr_in6*)sp)->sin6_addr = a.a6;
+		/* ((struct sockaddr_in6*)sp)->sin6_port = */
+		return 0; /* success */
+	}
+#endif
+	if (socklen >= sizeof(struct sockaddr_in)
+	 && inet_pton(AF_INET, dotted, &a.a4) > 0
+	) {
+		((struct sockaddr_in*)sp)->sin_family = AF_INET;
+		((struct sockaddr_in*)sp)->sin_addr = a.a4;
+		/* ((struct sockaddr_in*)sp)->sin_port = */
+		return 0; /* success */
+	}
+	return 1;
+}
+
+int xsocket_stream_ip4or6(sa_family_t *fp)
+{
+	int fd;
+#if ENABLE_FEATURE_IPV6
+	fd = socket(AF_INET6, SOCK_STREAM, 0);
+	if (fp) *fp = AF_INET6;
+	if (fd < 0)
+#endif
+	{
+		fd = xsocket(AF_INET, SOCK_STREAM, 0);
+		if (fp) *fp = AF_INET;
+	}
+	return fd;
+}
+
+int create_and_bind_socket_ip4or6(const char *hostaddr, int port)
+{
+	int fd;
+	sockaddr_inet sa;
+
+	memset(&sa, 0, sizeof(sa));
+	if (hostaddr) {
+		if (dotted2sockaddr(hostaddr, &sa.sa, sizeof(sa)))
+			bb_error_msg_and_die("bad address '%s'", hostaddr);
+		/* user specified bind addr dictates family */
+		fd = xsocket(sa.sa.sa_family, SOCK_STREAM, 0);
+	} else 
+		fd = xsocket_stream_ip4or6(&sa.sa.sa_family);
+	setsockopt_reuseaddr(fd);
+
+	/* if (port >= 0) { */
+#if ENABLE_FEATURE_IPV6
+		if (sa.sa.sa_family == AF_INET6 /* && !sa.sin6.sin6_port */)
+			sa.sin6.sin6_port = htons(port);
+#endif
+		if (sa.sa.sa_family == AF_INET /* && !sa.sin.sin_port */)
+			sa.sin.sin_port = htons(port);
+	/* } */
+
+	xbind(fd, &sa.sa, sizeof(sa));
+	return fd;
+}