X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=822f70def6aee8f6cf6e202832ab02c4553628b8;hb=6ac9ff30a69753606cc76913515ae34f5ce2868d;hp=ccb9632de9a30f566450cea2e4a62e29bd0c530f;hpb=06e47cd5c6d93afa59eadfa6e2ee89b7415180e0;p=paraslash.git

diff --git a/net.c b/net.c
index ccb9632d..822f70de 100644
--- a/net.c
+++ b/net.c
@@ -12,6 +12,11 @@
  */
 #define _GNU_SOURCE
 
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 /* At least NetBSD needs these. */
@@ -397,99 +402,95 @@ static int lookup_address(unsigned l4type, bool passive, const char *host,
 	return 1;
 }
 
-/**
- * Resolve IPv4/IPv6 address and create a ready-to-use active or passive socket.
+/*
+ * Create an active or passive socket.
  *
- * \param l4type The layer-4 type (\p IPPROTO_xxx).
- * \param passive Whether this is a passive or active socket.
- * \param host Passed to \ref \a lookup_address().
- * \param port_number Passed to \ref \a lookup_address().
+ * \param l4type \p IPPROTO_TCP, \p IPPROTO_UDP, or \p IPPROTO_DCCP.
+ * \param passive Whether to call bind(2) or connect(2).
+ * \param ai Address information as obtained from \ref lookup_address().
  * \param fo Socket options to be set before making the connection.
  *
- * This creates a ready-made IPv4/v6 socket structure after looking up the
- * necessary parameters.
- *
  * bind(2) is called on passive sockets, and connect(2) on active sockets. The
  * algorithm tries all possible address combinations until it succeeds. If \a
  * fo is supplied, options are set and cleanup is performed.
  *
- * \return Standard.
+ * \return File descriptor on success, \p E_MAKESOCK on errors.
  *
- *  \sa \ref lookup_address(), ipv6(7), getaddrinfo(3), bind(2), connect(2).
+ * \sa \ref lookup_address(), \ref makesock(), ip(7), ipv6(7), bind(2),
+ * connect(2).
  */
-int makesock(unsigned l4type, bool passive,
-	     const char *host, uint16_t port_number,
-	     struct flowopts *fo)
+static int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
+		struct flowopts *fo)
 {
-	struct addrinfo *local = NULL, *src = NULL, *remote = NULL, *dst = NULL;
-	int rc, on = 1, sockfd = -1;
-
-	rc = lookup_address(l4type, passive, host, port_number, passive?
-		&local : &remote);
-	if (rc < 0)
-		goto out;
-	/* Iterate over all src/dst combination, exhausting dst first */
-	for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) {
-		if (src && dst && src->ai_family == AF_INET
-				&& dst->ai_family == AF_INET6)
-			goto get_next_dst; /* v4 -> v6 is not possible */
-
-		sockfd = socket(src ? src->ai_family : dst->ai_family,
-			sock_type(l4type), l4type);
-		if (sockfd < 0)
-			goto get_next_dst;
+	int ret = -E_MAKESOCK, on = 1, sockfd = -1;
 
+	for (; ai; ai = ai->ai_next) {
+		ret = socket(ai->ai_family, sock_type(l4type), l4type);
+		if (ret < 0)
+			continue;
+		sockfd = ret;
+		flowopt_setopts(sockfd, fo);
+		if (!passive) {
+			if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) == 0)
+				return sockfd;
+			close(sockfd);
+			continue;
+		}
 		/*
 		 * Reuse the address on passive sockets to avoid failure on
 		 * restart (protocols using listen()) and when creating
 		 * multiple listener instances (UDP multicast).
 		 */
-		if (passive && setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
-						  &on, sizeof(on)) == -1) {
-			rc = errno;
+		if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on,
+				sizeof(on)) == -1) {
 			close(sockfd);
-			PARA_ERROR_LOG("can not set SO_REUSEADDR: %s\n",
-				       strerror(rc));
-			rc = -ERRNO_TO_PARA_ERROR(rc);
-			break;
-		}
-		flowopt_setopts(sockfd, fo);
-
-		if (src) {
-			if (bind(sockfd, src->ai_addr, src->ai_addrlen) < 0) {
-				close(sockfd);
-				goto get_next_src;
-			}
-			if (!dst) /* bind-only completed successfully */
-				break;
+			continue;
 		}
-
-		if (dst && connect(sockfd, dst->ai_addr, dst->ai_addrlen) == 0)
-			break; /* connection completed successfully */
-		close(sockfd);
-get_next_dst:
-		if (dst && (dst = dst->ai_next))
+		if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
+			close(sockfd);
 			continue;
-get_next_src:
-		if (src && (src = src->ai_next)) /* restart inner loop */
-			dst = remote;
+		}
+		return sockfd;
 	}
-out:
-	if (local)
-		freeaddrinfo(local);
-	if (remote)
-		freeaddrinfo(remote);
-	flowopt_cleanup(fo);
+	return -E_MAKESOCK;
+}
 
-	if (src == NULL && dst == NULL) {
-		if (rc >= 0)
-			rc = -E_MAKESOCK;
+/**
+ * Resolve IPv4/IPv6 address and create a ready-to-use active or passive socket.
+ *
+ * \param l4type The layer-4 type (\p IPPROTO_xxx).
+ * \param passive Whether this is a passive or active socket.
+ * \param host Passed to \ref lookup_address().
+ * \param port_number Passed to \ref lookup_address().
+ * \param fo Passed to \ref makesock_addrinfo().
+ *
+ * This creates a ready-made IPv4/v6 socket structure after looking up the
+ * necessary parameters. The function first calls \ref lookup_address() and
+ * passes the address information to makesock_addrinfo() to create and
+ * initialize the socket.
+ *
+ * \return The newly created file descriptor on success, a negative error code
+ * on failure.
+ *
+ * \sa \ref lookup_address(), \ref makesock_addrinfo().
+ */
+int makesock(unsigned l4type, bool passive, const char *host, uint16_t port_number,
+		struct flowopts *fo)
+{
+	struct addrinfo *ai;
+	int ret = lookup_address(l4type, passive, host, port_number, &ai);
+
+	if (ret >= 0)
+		ret = makesock_addrinfo(l4type, passive, ai, fo);
+	if (ai)
+		freeaddrinfo(ai);
+	flowopt_cleanup(fo);
+	if (ret < 0) {
 		PARA_ERROR_LOG("can not create %s socket %s#%d.\n",
-			layer4_name(l4type), host? host : (passive?
-			"[loopback]" : "[localhost]"), port_number);
-		return rc;
+		layer4_name(l4type), host? host : (passive?
+		"[loopback]" : "[localhost]"), port_number);
 	}
-	return sockfd;
+	return ret;
 }
 
 /**