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

diff --git a/net.c b/net.c
index 94610a84..822f70de 100644
--- a/net.c
+++ b/net.c
@@ -430,36 +430,29 @@ static int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
 			continue;
 		sockfd = ret;
 		flowopt_setopts(sockfd, fo);
-		if (passive) {
-			/*
-			 * Reuse the address on passive sockets to avoid
-			 * failure on restart (protocols using listen()) and
-			 * when creating multiple listener instances (UDP
-			 * multicast).
-			 */
-			if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on,
-					sizeof(on)) == -1) {
-				ret = -ERRNO_TO_PARA_ERROR(errno);
-				close(sockfd);
-				PARA_ERROR_LOG("can not set SO_REUSEADDR: %s\n",
-					para_strerror(-ret));
-				break;
-			}
-			if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
-				close(sockfd);
-				continue;
-			}
-			/* bind completed successfully */
-			break;
-		} else {
+		if (!passive) {
 			if (connect(sockfd, ai->ai_addr, ai->ai_addrlen) == 0)
-				break; /* connection completed successfully */
+				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 (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on,
+				sizeof(on)) == -1) {
+			close(sockfd);
+			continue;
+		}
+		if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {
+			close(sockfd);
+			continue;
 		}
-		close(sockfd);
+		return sockfd;
 	}
-	if (!ai)
-		return ret < 0? ret : -E_MAKESOCK;
-	return sockfd;
+	return -E_MAKESOCK;
 }
 
 /**