[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24596 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24596 - gnunet/src/testbed |
Date: |
Mon, 29 Oct 2012 17:40:46 +0100 |
Author: grothoff
Date: 2012-10-29 17:40:46 +0100 (Mon, 29 Oct 2012)
New Revision: 24596
Modified:
gnunet/src/testbed/gnunet-helper-testbed.c
gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api.c
gnunet/src/testbed/testbed_api_hosts.c
Log:
-fixes
Modified: gnunet/src/testbed/gnunet-helper-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-helper-testbed.c 2012-10-29 16:27:26 UTC (rev
24595)
+++ gnunet/src/testbed/gnunet-helper-testbed.c 2012-10-29 16:40:46 UTC (rev
24596)
@@ -225,6 +225,7 @@
struct GNUNET_TESTBED_HelperReply *reply;
struct GNUNET_CONFIGURATION_Handle *cfg;
struct WriteContext *wc;
+ char *binary;
char *controller;
char *hostname;
char *config;
@@ -312,11 +313,14 @@
goto error;
}
LOG_DEBUG ("Staring testbed with config: %s\n", config);
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
testbed =
GNUNET_OS_start_process (GNUNET_YES,
GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
- NULL, "gnunet-service-testbed",
+ NULL,
+ binary,
"gnunet-service-testbed", "-c", config, NULL);
+ GNUNET_free (binary);
GNUNET_free (config);
if (NULL == testbed)
{
Modified: gnunet/src/testbed/test_testbed_api_3peers_3controllers.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-10-29
16:27:26 UTC (rev 24595)
+++ gnunet/src/testbed/test_testbed_api_3peers_3controllers.c 2012-10-29
16:40:46 UTC (rev 24596)
@@ -707,6 +707,7 @@
"-o", "NoHostAuthenticationForLocalhost=yes", "-q",
host_str, "which", "gnunet-helper-testbed", NULL
};
+ // FIXME: the above no longer works with libexec/-installation!
struct GNUNET_OS_Process *auxp;
enum GNUNET_OS_ProcessStatusType type;
unsigned long code;
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-10-29
16:27:26 UTC (rev 24595)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-10-29
16:40:46 UTC (rev 24596)
@@ -660,6 +660,7 @@
"-o", "NoHostAuthenticationForLocalhost=yes", "-q",
host_str, "which", "gnunet-helper-testbed", NULL
};
+ // FIXME: the above no longer works with libexec/-installation!
struct GNUNET_OS_Process *auxp;
enum GNUNET_OS_ProcessStatusType type;
unsigned long code;
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2012-10-29 16:27:26 UTC (rev 24595)
+++ gnunet/src/testbed/testbed_api.c 2012-10-29 16:40:46 UTC (rev 24596)
@@ -1453,13 +1453,15 @@
static char *const binary_argv[] = {
HELPER_TESTBED_BINARY, NULL
};
-
+
hostname = NULL;
cp = GNUNET_malloc (sizeof (struct GNUNET_TESTBED_ControllerProc));
if ((NULL == host) || (0 == GNUNET_TESTBED_host_get_id_ (host)))
+ {
cp->helper =
GNUNET_HELPER_start (GNUNET_YES, HELPER_TESTBED_BINARY, binary_argv,
&helper_mst, &helper_exp_cb, cp);
+ }
else
{
char *remote_args[10];
@@ -1483,6 +1485,7 @@
remote_args[argp++] = "-o";
remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes";
remote_args[argp++] = cp->dst;
+ // FIXME: lib/gnunet/libexec/-prefix missing here!!!
remote_args[argp++] = HELPER_TESTBED_BINARY_SSH;
remote_args[argp++] = NULL;
GNUNET_assert (argp == 10);
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2012-10-29 16:27:26 UTC (rev
24595)
+++ gnunet/src/testbed/testbed_api_hosts.c 2012-10-29 16:40:46 UTC (rev
24596)
@@ -518,6 +518,7 @@
remote_args[argp++] = "-o";
remote_args[argp++] = "NoHostAuthenticationForLocalhost=yes";
remote_args[argp++] = ssh_addr;
+ // FIXME: this no longer works with 'libexec/' paths!
remote_args[argp++] = "which";
remote_args[argp++] = "gnunet-helper-testbed";
remote_args[argp++] = NULL;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24596 - gnunet/src/testbed,
gnunet <=