[GNUnet-SVN] r30091 - msh/src

[gnunet]

Author: harsha
Date: 2013-10-10 15:42:25 +0200 (Thu, 10 Oct 2013)
New Revision: 30091

Modified:
   msh/src/msh_waiter.c
   msh/src/mshd-server.c
   msh/src/run.sh
   msh/src/util.c
Log:
- keep up with how gnunet util handles UNIX domain sockets


Modified: msh/src/msh_waiter.c
===================================================================
--- msh/src/msh_waiter.c        2013-10-10 13:27:28 UTC (rev 30090)
+++ msh/src/msh_waiter.c        2013-10-10 13:42:25 UTC (rev 30091)
@@ -341,7 +341,7 @@
   laddr.sin_addr.s_addr = INADDR_ANY;
   laddr.sin_port = htons (port);
   ret = GNUNET_NETWORK_socket_bind (lsock, (const struct sockaddr *) &laddr,
-                                    sizeof (laddr), 0);
+                                    sizeof (laddr));
   if (GNUNET_SYSERR == ret)
     goto err_ret;
   ret = GNUNET_NETWORK_socket_listen (lsock, 1);

Modified: msh/src/mshd-server.c
===================================================================
--- msh/src/mshd-server.c       2013-10-10 13:27:28 UTC (rev 30090)
+++ msh/src/mshd-server.c       2013-10-10 13:42:25 UTC (rev 30091)
@@ -383,8 +383,7 @@
   our_gid = getgid ();
   saddr.sun_family = AF_UNIX;
   (void) memset (saddr.sun_path, 0, sizeof (saddr.sun_path));
-  (void) strncpy (saddr.sun_path, unixpath, sizeof (saddr.sun_path));
-  saddr.sun_path[0] = '\0';
+  (void) strncpy (saddr.sun_path, unixpath, sizeof (saddr.sun_path) - 1);
   local_serv = GNUNET_SERVER_create (&check_local_access, NULL,
                                      saddrs,
                                      saddr_lens,

Modified: msh/src/run.sh
===================================================================
--- msh/src/run.sh      2013-10-10 13:27:28 UTC (rev 30090)
+++ msh/src/run.sh      2013-10-10 13:42:25 UTC (rev 30091)
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-echo $MSHD_SOCK
-xterm
+echo "Running bash on" $(hostname)
+#xterm
+bash
 

Modified: msh/src/util.c
===================================================================
--- msh/src/util.c      2013-10-10 13:27:28 UTC (rev 30090)
+++ msh/src/util.c      2013-10-10 13:42:25 UTC (rev 30091)
@@ -29,7 +29,7 @@
     GNUNET_break (0);
     return NULL;
   }
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (lsock, addr, addrlen, 0))
+  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (lsock, addr, addrlen))
   {
     GNUNET_break (0);
     goto clo_ret;