Add a third default.

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

diff --git a/src/util/network.c b/src/util/network.c
index 7a4b2a0b3b655529a804d21111e9395aae8e7af1..d3a891a63735ff762f6581d3ec090005f22094d2 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -87,8 +87,8 @@ 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", 
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+               "Failed to create test socket: %s\n",
                STRERROR (errno));
     return GNUNET_SYSERR;
   }
@@ -393,27 +393,13 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                             socklen_t address_len)
 {
   int ret;
-  socklen_t bind_address_len = address_len;
-
-#ifdef LINUX
-  if (AF_UNIX == address->sa_family)
-  {
-    const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
-    if (address_un->sun_path[0] == '\0')
-      bind_address_len = \
-          sizeof (struct sockaddr_un) \
-        - sizeof (address_un->sun_path) \
-        + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
-        + 1;
-  }
-#endif
 
 #ifdef IPV6_V6ONLY
 #ifdef IPPROTO_IPV6
   {
     const int on = 1;
 
-    if (desc->af == AF_INET6)
+    if (AF_INET6 == desc->af)
       if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
                      (const void *) &on,
                      sizeof (on)))
@@ -431,7 +417,22 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
       LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
   }
 #endif
-  ret = bind (desc->fd, address, bind_address_len);
+#ifndef WINDOWS
+  {
+    /* set permissions of newly created UNIX domain socket to "user-only"; applications
+       can choose to relax this later */
+    mode_t old_mask = 0; /* assigned to make compiler happy */
+
+    if (AF_UNIX == address->sa_family)
+      old_mask = umask (S_IWGRP | S_IRGRP | S_IXGRP | S_IWOTH | S_IROTH | S_IXOTH);
+#endif
+
+    ret = bind (desc->fd, address, address_len);
+#ifndef WINDOWS
+    if (AF_UNIX == address->sa_family)
+      (void) umask (old_mask);
+  }
+#endif
 #ifdef MINGW
   if (SOCKET_ERROR == ret)
     SetErrnoFromWinsockError (WSAGetLastError ());
@@ -477,8 +478,8 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
     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", 
+      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+                        "unlink",
                         un->sun_path);
   }
 #endif
@@ -546,18 +547,6 @@ GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
 {
   int ret;
 
-#ifdef LINUX
-  if (address->sa_family == AF_UNIX)
-  {
-    const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
-    if(address_un->sun_path[0] == '\0')
-      address_len = \
-          sizeof (struct sockaddr_un) \
-        - sizeof (address_un->sun_path) \
-        + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
-        + 1;
-  }
-#endif
   ret = connect (desc->fd, address, address_len);
 
 #ifdef MINGW
@@ -781,18 +770,6 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
 #endif
 #ifdef MSG_NOSIGNAL
   flags |= MSG_NOSIGNAL;
-#endif
-#ifdef LINUX
-  if (dest_addr->sa_family == AF_UNIX)
-  {
-    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_un) \
-        - sizeof (dest_addr_un->sun_path) \
-        + strnlen (dest_addr_un->sun_path + 1, sizeof (dest_addr_un->sun_path) - 1) \
-        + 1;
-  }
 #endif
   ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
 #ifdef MINGW