X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=1fece043586cddc782791d0ec18af45881797c5f;hp=a58d84ef1c6345dcef41ca5b3ba76d3ed602cb7b;hb=62f16302b6cdb35de8b33894858cec81b34639be;hpb=10a62b85c43319d9cdefd7d04823aaed47b3817e

diff --git a/net.c b/net.c
index a58d84ef..1fece043 100644
--- a/net.c
+++ b/net.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file net.c Networking-related helper functions. */
 
@@ -429,15 +425,20 @@ int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
 	for (; ai; ai = ai->ai_next) {
 		int fd;
 		ret = socket(ai->ai_family, sock_type(l4type), l4type);
-		if (ret < 0)
+		if (ret < 0) {
+			PARA_NOTICE_LOG("socket(): %s\n", strerror(errno));
 			continue;
+		}
 		fd = ret;
 		flowopt_setopts(fd, fo);
 		if (!passive) {
-			if (connect(fd, ai->ai_addr, ai->ai_addrlen) == 0)
-				return fd;
-			close(fd);
-			continue;
+			if (connect(fd, ai->ai_addr, ai->ai_addrlen) < 0) {
+				PARA_NOTICE_LOG("connect(): %s\n",
+					strerror(errno));
+				close(fd);
+				continue;
+			}
+			return fd;
 		}
 		/*
 		 * Reuse the address on passive sockets to avoid failure on
@@ -446,10 +447,12 @@ int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
 		 */
 		if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on,
 				sizeof(on)) == -1) {
+			PARA_NOTICE_LOG("setsockopt(): %s\n", strerror(errno));
 			close(fd);
 			continue;
 		}
 		if (bind(fd, ai->ai_addr, ai->ai_addrlen) < 0) {
+			PARA_NOTICE_LOG("bind(): %s\n", strerror(errno));
 			close(fd);
 			continue;
 		}
@@ -500,16 +503,15 @@ int makesock(unsigned l4type, bool passive, const char *host, uint16_t port_numb
  *
  * \param l4type The transport-layer type (\p IPPROTO_xxx).
  * \param port The decimal port number to listen on.
- * \param fo Flowopts (if any) to set before starting to listen.
  *
  * \return Positive integer (socket descriptor) on success, negative value
  * otherwise.
  *
  * \sa \ref makesock(), ip(7), ipv6(7), bind(2), listen(2).
  */
-int para_listen(unsigned l4type, uint16_t port, struct flowopts *fo)
+int para_listen_simple(unsigned l4type, uint16_t port)
 {
-	int ret, fd = makesock(l4type, 1, NULL, port, fo);
+	int ret, fd = makesock(l4type, 1, NULL, port, NULL);
 
 	if (fd > 0) {
 		ret = listen(fd, BACKLOG);