From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 7 Feb 2011 16:00:50 +0000 (+0100)
Subject: usock: remove code duplication
X-Git-Url: http://git.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=07dbea00588bf322e16076cf7d818a13f934301f

usock: remove code duplication
---

diff --git a/usock.c b/usock.c
index 613b2dd..6458151 100644
--- a/usock.c
+++ b/usock.c
@@ -7,96 +7,95 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include "usock.h"
 
-int usock(int type, const char *host, const char *service) {
-	int sock = -1;
+static void usock_set_flags(int sock, unsigned int type)
+{
+	if (!(type & USOCK_NOCLOEXEC))
+		fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
+
+	if (type & USOCK_NONBLOCK)
+		fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
+}
+
+static int usock_connect(struct sockaddr *sa, int sa_len, int family, int socktype, bool server)
+{
+	int sock;
+
+	sock = socket(family, socktype, 0);
+	if (sock < 0)
+		return -1;
+
+	if (server) {
+		const int one = 1;
+		setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
 
-	if (service && !(type & USOCK_UNIX)) {
-		struct addrinfo *result, *rp;
-
-		struct addrinfo hints = {
-			.ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
-				(type & USOCK_IPV4ONLY) ? AF_INET : AF_UNSPEC,
-			.ai_socktype = ((type & 0xff) == USOCK_TCP)
-				? SOCK_STREAM : SOCK_DGRAM,
-			.ai_flags = AI_ADDRCONFIG
-				| ((type & USOCK_SERVER) ? AI_PASSIVE : 0)
-				| ((type & USOCK_NUMERIC) ? AI_NUMERICHOST : 0),
-		};
-
-		if (getaddrinfo(host, service, &hints, &result)) {
-			return -1;
-		}
-
-		for (rp = result; rp != NULL; rp = rp->ai_next) {
-			if ((sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol))
-			== -1) {
-				continue;
-			}
-
-			if (!(type & USOCK_NOCLOEXEC)) {
-				fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
-			}
-
-			if (type & USOCK_NONBLOCK) {
-				fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
-			}
-
-			if (type & USOCK_SERVER) {
-				const int one = 1;
-				setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-
-				if (!bind(sock, rp->ai_addr, rp->ai_addrlen)
-				&& ((type & 0xff) != USOCK_TCP || !listen(sock, SOMAXCONN))) {
-					break;
-				}
-			} else {
-				if (!connect(sock, rp->ai_addr, rp->ai_addrlen)
-				|| errno == EINPROGRESS) {
-					break;
-				}
-			}
-
-			close(sock);
-			sock = -1;
-		}
-		freeaddrinfo(result);
+		if (!bind(sock, sa, sa_len) &&
+		    (socktype != SOCK_STREAM || !listen(sock, SOMAXCONN)))
+			return sock;
 	} else {
-		struct sockaddr_un sun = {.sun_family = AF_UNIX};
-		if (strlen(host) >= sizeof(sun.sun_path)) {
-			errno = EINVAL;
-			return -1;
-		}
-		strcpy(sun.sun_path, host);
-
-		if ((sock = socket(AF_UNIX, ((type & 0xff) == USOCK_TCP)
-				? SOCK_STREAM : SOCK_DGRAM, 0)) == -1) {
-			return -1;
-		}
-
-		if (!(type & USOCK_NOCLOEXEC)) {
-			fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
-		}
-
-		if (type & USOCK_NONBLOCK) {
-			fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
-		}
-
-		if (type & USOCK_SERVER) {
-			if (bind(sock, (struct sockaddr*)&sun, sizeof(sun)) ||
-			((type & 0xff) == USOCK_TCP && listen(sock, SOMAXCONN))) {
-				close(sock);
-				return -1;
-			}
-		} else {
-			if (connect(sock, (struct sockaddr*)&sun, sizeof(sun))
-			&& errno != EINPROGRESS) {
-				close(sock);
-				return -1;
-			}
-		}
+		if (!connect(sock, sa, sa_len) || errno == EINPROGRESS)
+			return sock;
 	}
+
+	close(sock);
+	return -1;
+}
+
+static int usock_unix(const char *host, int socktype, bool server)
+{
+	struct sockaddr_un sun = {.sun_family = AF_UNIX};
+
+	if (strlen(host) >= sizeof(sun.sun_path)) {
+		errno = EINVAL;
+		return -1;
+	}
+	strcpy(sun.sun_path, host);
+
+	return usock_connect((struct sockaddr*)&sun, sizeof(sun), AF_UNIX, socktype, server);
+}
+
+static int usock_inet(int type, const char *host, const char *service, int socktype, bool server)
+{
+	struct addrinfo *result, *rp;
+	struct addrinfo hints = {
+		.ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
+			(type & USOCK_IPV4ONLY) ? AF_INET : AF_UNSPEC,
+		.ai_socktype = socktype,
+		.ai_flags = AI_ADDRCONFIG
+			| ((type & USOCK_SERVER) ? AI_PASSIVE : 0)
+			| ((type & USOCK_NUMERIC) ? AI_NUMERICHOST : 0),
+	};
+	int sock = -1;
+
+	if (getaddrinfo(host, service, &hints, &result))
+		return -1;
+
+	for (rp = result; rp != NULL; rp = rp->ai_next) {
+		sock = usock_connect(rp->ai_addr, rp->ai_addrlen, rp->ai_family, socktype, server);
+		if (sock >= 0)
+			break;
+	}
+
+	freeaddrinfo(result);
+	return sock;
+}
+
+int usock(int type, const char *host, const char *service) {
+	int socktype = ((type & 0xff) == USOCK_TCP) ? SOCK_STREAM : SOCK_DGRAM;
+	bool server = !!(type & USOCK_SERVER);
+	int sock;
+
+	if (type & USOCK_UNIX)
+		sock = usock_unix(host, socktype, server);
+	else
+		sock = usock_inet(type, host, service, socktype, server);
+
+	if (sock < 0)
+		return -1;
+
+	usock_set_flags(sock, type);
 	return sock;
 }