[GNUnet-SVN] r12079 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-07-01 17:42:51 +0200 (Thu, 01 Jul 2010)
New Revision: 12079

Modified:
   gnunet/src/util/network.c
Log:
unlink on bind

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2010-07-01 15:02:04 UTC (rev 12078)
+++ gnunet/src/util/network.c   2010-07-01 15:42:51 UTC (rev 12079)
@@ -41,14 +41,6 @@
 #ifndef MINGW
   int fd;
 
-#ifndef LINUX
-  /**
-   * For UNIX domain listen sockets, underlying filename to be removed
-   * on close.
-   */
-  char *filename;
-#endif
-
 #else
   SOCKET fd;
 #endif
@@ -273,7 +265,10 @@
   if ( (ret == 0) && (address->sa_family == AF_UNIX))
     {
       const struct sockaddr_un *un = (const struct sockaddr_un*) address;
-      desc->filename = GNUNET_strdup (un->sun_path);
+      if (0 != unlink (un->sun_path))
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+                                 "unlink",
+                                 un->sun_path);
     }
 #endif
 #endif
@@ -296,17 +291,7 @@
   SetErrnoFromWinsockError (WSAGetLastError ());
 #else
   ret = close (desc->fd);
-#ifndef LINUX
-  if (NULL != desc->filename)
-    {
-      if (0 != unlink (desc->filename))
-       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                                 "unlink",
-                                 desc->filename);
-      GNUNET_free (desc->filename);
-    }
 #endif
-#endif
   GNUNET_free (desc);
   return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
 }