-undo #29640, somehow causes problems

4 files changed, 40 insertions, 21 deletions

diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index f12303982..43eccf0aa 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -1070,7 +1070,6 @@ read_from_the_socket (void *sock,
   return count;
 }
 
-
 /**
  * Open the bluetooth interface for reading/writing
  *
@@ -1088,8 +1087,7 @@ open_device (struct HardwareInfos *dev)
     addr.btAddr = 0;
     addr.port = BT_PORT_ANY;
 
-    if (GNUNET_OK != 
-        GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof (SOCKADDR_BTH)))
+    if (GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof (SOCKADDR_BTH), 0) != GNUNET_OK)
     {
       fprintf (stderr, "Failed to bind the socket: ");
       if (GetLastError() == WSAENETDOWN)
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index eb3d92163..bc64fd5d2 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -2808,7 +2808,7 @@ setup_sockets (struct Plugin *plugin,
                                  GNUNET_a2s (serverAddr, addrlen));
                 /* binding */
                 if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
-                                                             serverAddr, addrlen))
+                                                             serverAddr, addrlen, 0))
                         break;
                 eno = errno;
                 if (0 != plugin->port)
@@ -2885,7 +2885,7 @@ setup_sockets (struct Plugin *plugin,
       
       /* binding */
       if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
-                                                   serverAddr, addrlen))
+                                                   serverAddr, addrlen, 0))
                 break;
       eno = errno;
       if (0 != plugin->port)
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 4e3038787..2087d30e5 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -572,6 +572,7 @@ unix_real_send (void *cls,
   const void *sb;
   size_t sbs;
   struct sockaddr_un un;
+  size_t slen;
   const char *unix_path;
 
 
@@ -591,12 +592,21 @@ unix_real_send (void *cls,
   unix_path = (const char *)  &addr[1];
   memset (&un, 0, sizeof (un));
   un.sun_family = AF_UNIX;
-  strncpy (un.sun_path, unix_path, sizeof (un.sun_path) - 1);
+  slen =  strlen (unix_path);
+  if (slen >= sizeof (un.sun_path))
+    slen = sizeof (un.sun_path) - 1;
+  GNUNET_assert (slen < sizeof (un.sun_path));
+  memcpy (un.sun_path, unix_path, slen);
+  un.sun_path[slen] = '\0';
+  slen = sizeof (struct sockaddr_un);
+#if LINUX
+  un.sun_path[0] = '\0';
+#endif
 #if HAVE_SOCKADDR_IN_SIN_LEN
-  un.sun_len = (u_char) sizeof (struct sockaddr_un);
+  un.sun_len = (u_char) slen;
 #endif
   sb = (struct sockaddr *) &un;
-  sbs = sizeof (struct sockaddr_un);
+  sbs = slen;
 
 resend:
   /* Send the data */
@@ -1013,18 +1023,19 @@ unix_plugin_select_read (struct Plugin *plugin)
   }
   else
   {
-    LOG (GNUNET_ERROR_TYPE_DEBUG, 
-         "Read %d bytes from socket %s\n", 
-         (int) ret,
-         un.sun_path);
+#if LINUX
+    un.sun_path[0] = '/';
+#endif
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
+                &un.sun_path[0]);
   }
 
   GNUNET_assert (AF_UNIX == (un.sun_family));
-  ua_len = sizeof (struct UnixAddress) + strlen (un.sun_path) + 1;
+  ua_len = sizeof (struct UnixAddress) + strlen (&un.sun_path[0]) +1;
   ua = GNUNET_malloc (ua_len);
   ua->addrlen = htonl (strlen (&un.sun_path[0]) +1);
   ua->options = htonl (0);
-  memcpy (&ua[1], &un.sun_path[0], strlen (un.sun_path) + 1);
+  memcpy (&ua[1], &un.sun_path[0], strlen (&un.sun_path[0]) +1);
 
   msg = (struct UNIXMessage *) buf;
   csize = ntohs (msg->header.size);
@@ -1203,7 +1214,7 @@ unix_plugin_select (void *cls,
  * Create a slew of UNIX sockets.  If possible, use IPv6 and IPv4.
  *
  * @param cls closure for server start, should be a struct Plugin *
- * @return number of sockets created or #GNUNET_SYSERR on error
+ * @return number of sockets created or GNUNET_SYSERR on error
  */
 static int
 unix_transport_server_start (void *cls)
@@ -1212,16 +1223,26 @@ unix_transport_server_start (void *cls)
   struct sockaddr *serverAddr;
   socklen_t addrlen;
   struct sockaddr_un un;
+  size_t slen;
 
   memset (&un, 0, sizeof (un));
   un.sun_family = AF_UNIX;
-  strncpy (un.sun_path, plugin->unix_socket_path, sizeof (un.sun_path) - 1);
+  slen = strlen (plugin->unix_socket_path) + 1;
+  if (slen >= sizeof (un.sun_path))
+    slen = sizeof (un.sun_path) - 1;
+
+  memcpy (un.sun_path, plugin->unix_socket_path, slen);
+  un.sun_path[slen] = '\0';
+  slen = sizeof (struct sockaddr_un);
 #if HAVE_SOCKADDR_IN_SIN_LEN
-  un.sun_len = (u_char) sizeof (struct sockaddr_un);
+  un.sun_len = (u_char) slen;
 #endif
 
   serverAddr = (struct sockaddr *) &un;
-  addrlen = sizeof (struct sockaddr_un);
+  addrlen = slen;
+#if LINUX
+  un.sun_path[0] = '\0';
+#endif
   plugin->ats_network = plugin->env->get_address_type (plugin->env->cls, serverAddr, addrlen);
   plugin->unix_sock.desc =
       GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
@@ -1230,8 +1251,8 @@ unix_transport_server_start (void *cls)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
     return GNUNET_SYSERR;
   }
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen))
+  if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen, 0)
+      != GNUNET_OK)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
     GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index d33fa99fe..fd8b5dbbb 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -9,7 +9,7 @@ NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 PLUGINS = tcp udp
-UNIXPATH = $SERVICEHOME/gnunet-service-transport.sock
+UNIXPATH = /tmp/gnunet-service-transport.sock
 BLACKLIST_FILE = $SERVICEHOME/blacklist
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES