[GNUnet-SVN] r16196 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2011-07-26 14:54:23 +0200 (Tue, 26 Jul 2011)
New Revision: 16196

Modified:
   gnunet/src/testing/testing_group.c
Log:
remote host testing

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-07-26 12:48:39 UTC (rev 16195)
+++ gnunet/src/testing/testing_group.c  2011-07-26 12:54:23 UTC (rev 16196)
@@ -6128,8 +6128,6 @@
               hostname = pg->hosts[off % hostcnt].hostname;
               username = pg->hosts[off % hostcnt].username;
               sshport = pg->hosts[off % hostcnt].sshport;
-              pcfg = make_config (cfg, off, &pg->hosts[off % hostcnt].minport,
-                                  &upnum, hostname, &fdnum);
             }
           else
             {
@@ -6144,9 +6142,9 @@
                                                         &baseservicehome))
             {
               if (hostname != NULL)
-                GNUNET_asprintf (&newservicehome, "%s/%s/%d/", 
baseservicehome, hostname, off);
+                GNUNET_asprintf (&newservicehome, "%s/%s/", baseservicehome, 
hostname);
               else
-                GNUNET_asprintf (&newservicehome, "%s/%d/", baseservicehome, 
off);
+                GNUNET_asprintf (&newservicehome, "%s/", baseservicehome);
               GNUNET_free (baseservicehome);
               baseservicehome = NULL;
             }
@@ -6155,26 +6153,24 @@
               tmpdir = getenv ("TMPDIR");
               tmpdir = tmpdir ? tmpdir : "/tmp";
               if (hostname != NULL)
-                GNUNET_asprintf (&newservicehome, "%s/%s/%s/%d/", tmpdir, 
hostname,
-                                 "gnunet-testing-test-test", off);
+                GNUNET_asprintf (&newservicehome, "%s/%s/%s/", tmpdir, 
hostname,
+                                 "gnunet-testing-test-test");
               else
-                GNUNET_asprintf (&newservicehome, "%s/%s/%d/", tmpdir,
+                GNUNET_asprintf (&newservicehome, "%s/%s/", tmpdir,
                                  "gnunet-testing-test-test", off);
             }
 
           if (NULL != username)
             GNUNET_asprintf (&arg, 
-                            "address@hidden:%s/%s", 
+                            "address@hidden:%s",
                             username, 
                             pg->hosts[off].hostname, 
-                            newservicehome,
-                            pg->hosts[off].hostname);
+                            newservicehome);
           else
             GNUNET_asprintf (&arg, 
-                            "%s:%s/%s", 
+                            "%s:%s",
                             pg->hosts[off].hostname,
-                            newservicehome,
-                            pg->hosts[off].hostname);
+                            newservicehome);
          
           /* FIXME: Doesn't support ssh_port option! */
           proc = GNUNET_OS_start_process (NULL, NULL,