X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=92ae217d6b4bf7cdc438ff018774f9c0d9bdbc03;hp=b9729b6988f894a3e346a591b477ed0fb9012149;hb=98f2c8aea52a49fad3fd6df67b1eb32c1499176c;hpb=05029e5af523f92849b4f691a15a963cb6a10e1f

diff --git a/net.c b/net.c
index b9729b69..92ae217d 100644
--- a/net.c
+++ b/net.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -436,6 +436,7 @@ int makesock(unsigned l4type, bool passive,
 		if (passive && setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR,
 						  &on, sizeof(on)) == -1) {
 			rc = errno;
+			close(sockfd);
 			PARA_ERROR_LOG("can not set SO_REUSEADDR: %s\n",
 				       strerror(rc));
 			return -ERRNO_TO_PARA_ERROR(rc);
@@ -775,30 +776,35 @@ int para_accept(int fd, void *addr, socklen_t size)
 }
 
 /**
- * Probe the list of DCCP CCIDs supported locally by the host.
- * \param ccids Array to be filled in.
- * \param nccids Length of \a ccids.
- * \return Pointer to \a ccids, NULL on failure.
+ * Probe the list of DCCP CCIDs configured on this host.
+ * \param ccid_array Pointer to return statically allocated array in.
+ * \return Number of elements returned in \a ccid_array or error.
  *
  * NB: This feature is only available on Linux > 2.6.30; on older kernels
  * ENOPROTOOPT ("Protocol not available") will be returned.
  */
-const uint8_t *dccp_available_ccids(uint8_t *ccids, uint8_t *nccids)
+int dccp_available_ccids(uint8_t **ccid_array)
 {
-	int fd = makesock(IPPROTO_DCCP, 1, NULL, 0, NULL);
+	static uint8_t ccids[DCCP_MAX_HOST_CCIDS];
+	socklen_t nccids = sizeof(ccids);
+	int ret, fd;
 
-	if (fd < 0)
-		return NULL;
+	ret = fd = makesock(IPPROTO_DCCP, 1, NULL, 0, NULL);
+	if (ret < 0)
+		return ret;
 
 	if (getsockopt(fd, SOL_DCCP, DCCP_SOCKOPT_AVAILABLE_CCIDS,
-					ccids, (socklen_t *)nccids) < 0) {
+						ccids, &nccids) < 0) {
+		ret = errno;
+		close(fd);
 		PARA_ERROR_LOG("No DCCP_SOCKOPT_AVAILABLE_CCIDS: %s\n",
-				strerror(errno));
-		*nccids = 0;
+				strerror(ret));
+		return -ERRNO_TO_PARA_ERROR(ret);
 	}
-	close(fd);
 
-	return *nccids ? ccids : NULL;
+	close(fd);
+	*ccid_array = ccids;
+	return nccids;
 }
 
 /**