Update plibc header

[oweals/gnunet.git] / src / util / network.c

diff --git a/src/util/network.c b/src/util/network.c
index 793290b4518639b9b8598e7226075b2349f5550e..a921998e9244c1712f847f7e395118d54cb98ce4 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -25,8 +25,8 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "disk.h"
 #include "gnunet_util_lib.h"
+#include "disk.h"
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
 #define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
@@ -87,9 +87,7 @@ GNUNET_NETWORK_test_pf (int pf)
   {
     if (EAFNOSUPPORT == errno)
       return GNUNET_NO;
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
-               "Failed to create test socket: %s\n", 
-               STRERROR (errno));
+    fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
     return GNUNET_SYSERR;
   }
 #if WINDOWS
@@ -120,7 +118,7 @@ GNUNET_NETWORK_shorten_unixpath (char *unixpath)
   struct GNUNET_CRYPTO_HashAsciiEncoded ae;
   size_t upm;
 
-  upm = sizeof (dummy.sun_path);   
+  upm = sizeof (dummy.sun_path);
   slen = strlen (unixpath);
   if (slen < upm)
     return unixpath; /* no shortening required */
@@ -245,7 +243,7 @@ socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
   int abs_value = 1;
 
   if (0 !=
-      setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, 
+      setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
                  (const void *) &abs_value,
                   sizeof (abs_value)))
     LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
@@ -272,7 +270,7 @@ socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h)
   const char *abs_value = "1";
 
   if (0 !=
-      setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, 
+      setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
                  (const void *) abs_value,
                   sizeof (abs_value)))
     LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
@@ -327,7 +325,7 @@ initialize_network_handle (struct GNUNET_NETWORK_Handle *h,
 #ifdef DARWIN
   socket_set_nosigpipe (h);
 #endif
-  if ( (type == SOCK_STREAM) 
+  if ( (type == SOCK_STREAM)
 #ifdef AF_UNIX
        && (af != AF_UNIX)
 #endif
@@ -347,7 +345,7 @@ initialize_network_handle (struct GNUNET_NETWORK_Handle *h,
  */
 struct GNUNET_NETWORK_Handle *
 GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
-                              struct sockaddr *address, 
+                              struct sockaddr *address,
                              socklen_t *address_len)
 {
   struct GNUNET_NETWORK_Handle *ret;
@@ -360,7 +358,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
     int gsn = getsockname (desc->fd, &name, &namelen);
 
     if (gsn == 0)
-      LOG (GNUNET_ERROR_TYPE_DEBUG, 
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
           "Accepting connection on `%s'\n",
            GNUNET_a2s (&name, namelen));
   }
@@ -385,18 +383,20 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
  * @param desc socket to bind
  * @param address address to be bound
  * @param address_len length of @a address
+ * @param flags flags affecting bind behaviour
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                             const struct sockaddr *address,
-                            socklen_t address_len)
+                            socklen_t address_len,
+                            int flags)
 {
   int ret;
   socklen_t bind_address_len = address_len;
 
 #ifdef LINUX
-  if (AF_UNIX == address->sa_family)
+  if (address->sa_family == AF_UNIX)
   {
     const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
     if (address_un->sun_path[0] == '\0')
@@ -414,8 +414,8 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
     const int on = 1;
 
     if (desc->af == AF_INET6)
-      if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY, 
-                     (const void *) &on, 
+      if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+                     (const void *) &on,
                      sizeof (on)))
         LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
   }
@@ -424,12 +424,22 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
 #ifndef WINDOWS
   {
     const int on = 1;
-  
+
     /* This is required here for TCP sockets, but only on UNIX */
-    if ((SOCK_STREAM == desc->type) 
+    if ((SOCK_STREAM == desc->type)
         && (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on))))
       LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
   }
+#endif
+#ifndef LINUX
+#ifndef MINGW
+  if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
+  {
+    const struct sockaddr_un *un = (const struct sockaddr_un *) address;
+
+    (void) unlink (un->sun_path);
+  }
+#endif
 #endif
   ret = bind (desc->fd, address, bind_address_len);
 #ifdef MINGW
@@ -439,9 +449,11 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
   if (ret != 0)
     return GNUNET_SYSERR;
 #ifndef MINGW
+#ifndef LINUX
   desc->addr = GNUNET_malloc (address_len);
   memcpy (desc->addr, address, address_len);
   desc->addrlen = address_len;
+#endif
 #endif
   return GNUNET_OK;
 }
@@ -471,16 +483,16 @@ 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))
-      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, 
-                        "unlink", 
-                        un->sun_path);
+      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", un->sun_path);
   }
+#endif
 #endif
   GNUNET_NETWORK_socket_free_memory_only_ (desc);
   return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
@@ -788,7 +800,7 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
     const struct sockaddr_un *dest_addr_un = (const struct sockaddr_un *)dest_addr;
     if (dest_addr_un->sun_path[0] == '\0')
       dest_len = \
-          sizeof (struct sockaddr) \
+          sizeof (struct sockaddr_un) \
         - sizeof (dest_addr_un->sun_path) \
         + strnlen (dest_addr_un->sun_path + 1, sizeof (dest_addr_un->sun_path) - 1) \
         + 1;
@@ -1425,7 +1437,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
   tv.tv_usec =
     (timeout.rel_value_us -
      (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
-  return select (nfds, 
+  return select (nfds,
                 (NULL != rfds) ? &rfds->sds : NULL,
                  (NULL != wfds) ? &wfds->sds : NULL,
                  (NULL != efds) ? &efds->sds : NULL,