7 files changed, 18 insertions, 17 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 201b4c1ff..a9837daf5 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -101,6 +101,7 @@ gnunet_cmds_helper_SOURCES = \
 gnunet_cmds_helper_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
  libgnunettestbed.la \
  $(LTLIBINTL) $(Z_LIBS)
 
diff --git a/src/testbed/netjail_exec.sh b/src/testbed/netjail_exec.sh
index 532f4711c..b76d2e444 100755
--- a/src/testbed/netjail_exec.sh
+++ b/src/testbed/netjail_exec.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-. "./netjail_core.sh"
+. "./../testbed/netjail_core.sh"
 
 set -eu
 set -x
diff --git a/src/testbed/netjail_start.sh b/src/testbed/netjail_start.sh
index a2abca2d7..4c1c33c83 100755
--- a/src/testbed/netjail_start.sh
+++ b/src/testbed/netjail_start.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-. "./netjail_core.sh"
+. "./../testbed/netjail_core.sh"
 
 set -eu
 set -x
diff --git a/src/testbed/netjail_stop.sh b/src/testbed/netjail_stop.sh
index 4763cb107..689bf7ae9 100755
--- a/src/testbed/netjail_stop.sh
+++ b/src/testbed/netjail_stop.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-. "./netjail_core.sh"
+. "./../testbed/netjail_core.sh"
 
 set -eu
 set -x
diff --git a/src/testbed/testbed_api_cmd_netjail_start.c b/src/testbed/testbed_api_cmd_netjail_start.c
index 1e37d5475..bc035abe7 100644
--- a/src/testbed/testbed_api_cmd_netjail_start.c
+++ b/src/testbed/testbed_api_cmd_netjail_start.c
@@ -28,7 +28,7 @@
 #include "gnunet_testing_ng_lib.h"
 #include "gnunet_testbed_ng_service.h"
 
-#define NETJAIL_START_SCRIPT "./netjail_start.sh"
+#define NETJAIL_START_SCRIPT "./../testbed/netjail_start.sh"
 
 struct NetJailState
 {
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
index 9b68c52f6..67f0ef55c 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
@@ -30,7 +30,7 @@
 #include "testbed_api_hosts.h"
 #include "testbed_helper.h"
 
-#define NETJAIL_EXEC_SCRIPT "./netjail_exec.sh"
+#define NETJAIL_EXEC_SCRIPT "./../testbed/netjail_exec.sh"
 
 struct HelperMessage;
 
@@ -319,15 +319,15 @@ create_helper_init_msg_ (char *m_char,
 static void
 start_testbed (struct NetJailState *ns, struct
                GNUNET_CONFIGURATION_Handle *config,
-               char *n_char,
-               char *m_char)
+               char *m_char,
+               char *n_char)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg;
+  // struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_CMDS_HelperInit *msg;
   struct TestbedCount *tbc;
   char *const script_argv[] = {NETJAIL_EXEC_SCRIPT,
-                               n_char,
                                m_char,
+                               n_char,
                                GNUNET_OS_get_libexec_binary_path (
                                  HELPER_CMDS_BINARY),
                                ns->global_n,
@@ -345,17 +345,17 @@ start_testbed (struct NetJailState *ns, struct
   tbc->ns = ns;
   tbc->count = (n - 1) * atoi (ns->local_m) + m;
 
-  cfg = GNUNET_CONFIGURATION_dup (config);
+  // cfg = GNUNET_CONFIGURATION_dup (config);
 
   // TODO We do not need this?
-  GNUNET_array_append (ns->host, ns->n_host,
+  /*GNUNET_array_append (ns->host, ns->n_host,
                        GNUNET_TESTBED_host_create_with_id (tbc->count - 1,
                                                            NULL,
                                                            NULL,
                                                            cfg,
-                                                           0));
+                                                           0));*/
 
-  if ((GNUNET_YES != GNUNET_DISK_file_test ("test_testbed_api.conf")) ||
+  /*if ((GNUNET_YES != GNUNET_DISK_file_test ("test_testbed_api.conf")) ||
       (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (config,
                                                    "test_testbed_api.conf")))
   {
@@ -363,7 +363,7 @@ start_testbed (struct NetJailState *ns, struct
                 _ (
                   "Unreadable or malformed configuration file `%s', exit ...\n"),
                 "test_testbed_api.conf");
-  }
+                }*/
 
   GNUNET_array_append (ns->helper, ns->n_helper, GNUNET_HELPER_start (
                          GNUNET_YES,
@@ -425,8 +425,8 @@ netjail_exec_run (void *cls,
       sprintf (str_n, "%d", i);
       sprintf (str_m, "%d", j);
       start_testbed (ns, config,
-                     str_n,
-                     str_m);
+                     str_m,
+                     str_n);
     }
   }
 }
diff --git a/src/testbed/testbed_api_cmd_netjail_stop.c b/src/testbed/testbed_api_cmd_netjail_stop.c
index 1e6586f94..c0fc33ff9 100644
--- a/src/testbed/testbed_api_cmd_netjail_stop.c
+++ b/src/testbed/testbed_api_cmd_netjail_stop.c
@@ -29,7 +29,7 @@
 #include "gnunet_testbed_ng_service.h"
 
 
-#define NETJAIL_STOP_SCRIPT "./netjail_stop.sh"
+#define NETJAIL_STOP_SCRIPT "./../testbed/netjail_stop.sh"
 
 struct GNUNET_ChildWaitHandle *cwh;