[GNUnet-SVN] r28557 - msh/src

[gnunet]

Author: harsha
Date: 2013-08-13 10:40:00 +0200 (Tue, 13 Aug 2013)
New Revision: 28557

Modified:
   msh/src/msh.c
   msh/src/mshd-server.c
   msh/src/mshd.c
Log:
- use abstract unix domain sockets


Modified: msh/src/msh.c
===================================================================
--- msh/src/msh.c       2013-08-13 07:03:21 UTC (rev 28556)
+++ msh/src/msh.c       2013-08-13 08:40:00 UTC (rev 28557)
@@ -499,7 +499,7 @@
   uint16_t size;
 
   cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_CONFIGURATION_set_value_string (cfg, MSHD_REMOTE, "LISTEN",
+  GNUNET_CONFIGURATION_set_value_string (cfg, MSHD_REMOTE, "HOSTNAME",
                                          ip2str (target));
   GNUNET_CONFIGURATION_set_value_number (cfg, MSHD_REMOTE, "PORT",
                                          target_port);

Modified: msh/src/mshd-server.c
===================================================================
--- msh/src/mshd-server.c       2013-08-13 07:03:21 UTC (rev 28556)
+++ msh/src/mshd-server.c       2013-08-13 08:40:00 UTC (rev 28557)
@@ -510,10 +510,7 @@
   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 [sizeof (saddr.sun_path) - 1] = '\0';
-#if LINUX
   saddr.sun_path[0] = '\0';
-#endif
   local_serv = GNUNET_SERVER_create (&check_local_access, NULL,
                                      saddrs,
                                      saddr_lens,

Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-08-13 07:03:21 UTC (rev 28556)
+++ msh/src/mshd.c      2013-08-13 08:40:00 UTC (rev 28557)
@@ -449,7 +449,6 @@
 static void
 schedule_next_round ()
 {
-  char *dtemp;
   intmax_t pid;
   int total_rounds;
 
@@ -468,10 +467,7 @@
   listen_mode = LISTEN_MODE_SERV;
   rmap = addressmap_create_reverse_mapping (addrmap);
   pid = (intmax_t) getpid ();
-  dtemp = GNUNET_DISK_mkdtemp ("mshd");
-  GNUNET_assert (NULL != dtemp);
-  GNUNET_assert (0 < asprintf (&unixpath, "%s/%ju.sock", dtemp, pid));
-  GNUNET_free (dtemp);
+  GNUNET_assert (0 < asprintf (&unixpath, "%ju.sock", pid));
   setenv (MSHD_SOCK_NAME, unixpath, 1);
   init_local_server (unixpath);
   init_daemon_server (listen_socket);
@@ -1098,12 +1094,7 @@
   GNUNET_free_non_null (s_addrs);
   if (NULL != run_args)
     free_argv (run_args);
-  if (NULL != unixpath)
-  {
-    GNUNET_break (GNUNET_OK == 
-                  GNUNET_DISK_directory_remove (dirname (unixpath)));
-    GNUNET_free (unixpath);
-  }
+  GNUNET_free_non_null (unixpath);
   LOG_DEBUG ("Returning\n");
   GNUNET_break (MPI_SUCCESS == MPI_Finalize());
   return ret;