- added first testcase cmd code for sending a simple testmessage

4 files changed, 16 insertions, 9 deletions

diff --git a/src/testbed/gnunet-cmds-helper.c b/src/testbed/gnunet-cmds-helper.c
index 0d618bd48..113e3c386 100644
--- a/src/testbed/gnunet-cmds-helper.c
+++ b/src/testbed/gnunet-cmds-helper.c
@@ -427,7 +427,8 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     strcat (node_ip, NODE_BASE_IP);
     strcat (node_ip, plugin->n);
 
-    plugin->api->start_testcase (&write_message, router_ip, node_ip);
+    plugin->api->start_testcase (&write_message, router_ip, node_ip, plugin->m,
+                                 plugin->n);
 
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "We got here!\n");
@@ -479,8 +480,6 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
   else if (GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED == ntohs (
              message->type))
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "We got here 8!\n");
     plugin->api->all_peers_started ();
     return GNUNET_OK;
   }
diff --git a/src/testbed/plugin_testcmd.c b/src/testbed/plugin_testcmd.c
index 70b6ad3ae..797826781 100644
--- a/src/testbed/plugin_testcmd.c
+++ b/src/testbed/plugin_testcmd.c
@@ -46,7 +46,9 @@ all_peers_started ()
 
 static void
 start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip,
-                char *node_ip)
+                char *node_ip,
+                char *n,
+                char *m)
 {
   struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
 
@@ -110,4 +112,4 @@ libgnunet_plugin_testcmd_done (void *cls)
 }
 
 
-/* end of plugin_gnsrecord_dns.c */
+/* end of plugin_testcmd.c */
diff --git a/src/testbed/test_testbed_api_cmd_netjail.c b/src/testbed/test_testbed_api_cmd_netjail.c
index e5fc0877e..8bb9e40e8 100644
--- a/src/testbed/test_testbed_api_cmd_netjail.c
+++ b/src/testbed/test_testbed_api_cmd_netjail.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/test_testing_api_cmd_netjail.c
+ * @file testing/test_testbed_api_cmd_netjail.c
  * @brief Test case executing a script in a network name space.
  * @author t3sserakt
  */
@@ -44,7 +44,8 @@ run (void *cls)
                                       "2"),
     GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-start-testbed-1",
                                               "2",
-                                              "2"),
+                                              "2",
+                                              "libgnunet_plugin_testcmd"),
     GNUNET_TESTBED_cmd_stop_testbed ("stop-testbed",
                                      "netjail-start-testbed-1",
                                      "2",
diff --git a/src/testbed/testbed_api_cmd_netjail_start_testbed.c b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
index bc4674b74..9b68c52f6 100644
--- a/src/testbed/testbed_api_cmd_netjail_start_testbed.c
+++ b/src/testbed/testbed_api_cmd_netjail_start_testbed.c
@@ -97,6 +97,8 @@ struct NetJailState
   struct GNUNET_TESTBED_Host **host;
 
   unsigned int n_host;
+
+  char *plugin_name;
 };
 
 struct TestbedCount
@@ -345,6 +347,7 @@ start_testbed (struct NetJailState *ns, struct
 
   cfg = GNUNET_CONFIGURATION_dup (config);
 
+  // TODO We do not need this?
   GNUNET_array_append (ns->host, ns->n_host,
                        GNUNET_TESTBED_host_create_with_id (tbc->count - 1,
                                                            NULL,
@@ -374,7 +377,7 @@ start_testbed (struct NetJailState *ns, struct
 
   msg = create_helper_init_msg_ (m_char,
                                  n_char,
-                                 "libgnunet_plugin_testcmd");
+                                 ns->plugin_name);
   GNUNET_array_append (ns->msg, ns->n_msg, &msg->header);
 
   GNUNET_array_append (ns->shandle, ns->n_shandle, GNUNET_HELPER_send (
@@ -506,13 +509,15 @@ netjail_start_finish (void *cls,
 struct GNUNET_TESTING_Command
 GNUNET_TESTBED_cmd_netjail_start_testbed (const char *label,
                                           char *local_m,
-                                          char *global_n)
+                                          char *global_n,
+                                          char *plugin_name)
 {
   struct NetJailState *ns;
 
   ns = GNUNET_new (struct NetJailState);
   ns->local_m = local_m;
   ns->global_n = global_n;
+  ns->plugin_name = plugin_name;
 
   struct GNUNET_TESTING_Command cmd = {
     .cls = ns,