- there are two helper running, but only one is doing the work of both. Therefore connecting peers does not work atm.

4 files changed, 13 insertions, 5 deletions

diff --git a/src/testbed/gnunet-cmd.c b/src/testbed/gnunet-cmd.c
index f232bd805..0ba94fdd9 100644
--- a/src/testbed/gnunet-cmd.c
+++ b/src/testbed/gnunet-cmd.c
@@ -90,7 +90,7 @@ run (void *cls)
   strcat (node_ip, NODE_BASE_IP);
   strcat (node_ip, plugin->n);
 
-  plugin->api->start_testcase (NULL, router_ip, node_ip, NULL, NULL);
+  plugin->api->start_testcase (NULL, router_ip, node_ip, NULL, NULL, NULL);
 
 }
 
diff --git a/src/testbed/gnunet-cmds-helper.c b/src/testbed/gnunet-cmds-helper.c
index c4a3e98d9..7cb753c23 100644
--- a/src/testbed/gnunet-cmds-helper.c
+++ b/src/testbed/gnunet-cmds-helper.c
@@ -428,7 +428,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     strcat (node_ip, plugin->n);
 
     plugin->api->start_testcase (&write_message, router_ip, node_ip, plugin->m,
-                                 plugin->n);
+                                 plugin->n, plugin->local_m);
 
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "We got here!\n");
diff --git a/src/testbed/plugin_testcmd.c b/src/testbed/plugin_testcmd.c
index 797826781..e08ec067d 100644
--- a/src/testbed/plugin_testcmd.c
+++ b/src/testbed/plugin_testcmd.c
@@ -48,7 +48,8 @@ static void
 start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *node_ip,
                 char *n,
-                char *m)
+                char *m,
+                char *local_m)
 {
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
 
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
index de3926696..fa0084a0a 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
@@ -373,10 +373,17 @@ start_testbed (struct NetJailState *ns, struct
                          tbc));
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "First using helper %d\n",
-                    tbc->count - 1);
+                    "First using helper %d %d\n",
+              tbc->count - 1,
+              ns->n_helper);
   struct GNUNET_HELPER_Handle *helper = ns->helper[tbc->count - 1];
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "First using helper %d %d %p\n",
+              tbc->count - 1,
+              ns->n_helper,
+              helper);
+
   msg = create_helper_init_msg_ (m_char,
                                  n_char,
                                  ns->plugin_name);