From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 24 May 2011 16:35:59 +0000 (+0000)
Subject: bug on bsd
X-Git-Tag: initial-import-from-subversion-38251~18435
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c8474ed9fabff3506d86c915e08fd9f5827ee3ec;p=oweals%2Fgnunet.git

bug on bsd
---

diff --git a/src/util/network.c b/src/util/network.c
index d23f1a23d..5ff49b1ca 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -29,7 +29,7 @@
 #include "disk.h"
 #include "gnunet_container_lib.h"
 
-#define DEBUG_NETWORK GNUNET_NO
+#define DEBUG_NETWORK GNUNET_YES
 
 #ifndef INVALID_SOCKET
 #define INVALID_SOCKET -1
@@ -49,6 +49,17 @@ struct GNUNET_NETWORK_Handle
    * Address family / domain.
    */
   int af;
+
+  /**
+   * Number of bytes in addr.
+   */
+  socklen_t addrlen;
+
+  /**
+   * Address we were bound to, or NULL.
+   */
+  struct sockaddr *addr;
+
 };
 
 
@@ -278,24 +289,31 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
 #endif
 #endif
+#endif
+#ifndef LINUX
+#ifndef MINGW
+  if (address->sa_family == AF_UNIX)
+    {
+      const struct sockaddr_un *un = (const struct sockaddr_un*) address;
+      (void) unlink (un->sun_path);
+    }
+#endif
 #endif
   ret = bind (desc->fd, address, address_len);
 #ifdef MINGW
   if (SOCKET_ERROR == ret)
     SetErrnoFromWinsockError (WSAGetLastError ());
-#else
+#endif
+  if (ret != 0)
+	  return GNUNET_SYSERR;
+#ifndef MINGW
 #ifndef LINUX
-  if ( (ret == 0) && (address->sa_family == AF_UNIX))
-    {
-      const struct sockaddr_un *un = (const struct sockaddr_un*) address;
-      if (0 != unlink (un->sun_path))
-	GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-				  "unlink",
-				  un->sun_path);
-    }
+  desc->addr = GNUNET_malloc (address_len);
+  memcpy (desc->addr, address, address_len);
+  desc->addrlen = address_len;
 #endif
 #endif
-  return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+  return GNUNET_OK;
 }
 
 
@@ -315,6 +333,19 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 #else
   ret = close (desc->fd);
 #endif
+#ifndef LINUX
+#ifndef MINGW
+  if ( (desc->af == AF_UNIX) && (NULL != desc->addr) )
+    {
+      const struct sockaddr_un *un = (const struct sockaddr_un*) desc->addr;
+      if (0 != unlink (un->sun_path))
+    	  GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+				  "unlink",
+				  un->sun_path);
+    }
+#endif
+#endif
+   GNUNET_free_non_null (desc->addr);
   GNUNET_free (desc);
   return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
 }