1 files changed, 38 insertions, 20 deletions

diff --git a/src/testing/testing_api_cmd_netjail_stop_testsystem.c b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
index 0ae82a26a..d3754153d 100644
--- a/src/testing/testing_api_cmd_netjail_stop_testsystem.c
+++ b/src/testing/testing_api_cmd_netjail_stop_testsystem.c
@@ -42,9 +42,15 @@ struct StopHelperState
    */
   struct GNUNET_HELPER_Handle **helper;
 
-  char *local_m;
+  unsigned int local_m;
 
-  char *global_n;
+  unsigned int global_n;
+
+  /**
+   * Number of global known nodes.
+   *
+   */
+  unsigned int known;
 };
 
 
@@ -55,8 +61,7 @@ struct StopHelperState
 * @param cmd current CMD being cleaned up.
 */
 static void
-stop_testing_system_cleanup (void *cls,
-                             const struct GNUNET_TESTING_Command *cmd)
+stop_testing_system_cleanup (void *cls)
 {
 
 }
@@ -80,28 +85,40 @@ stop_testing_system_traits (void *cls,
 * This function stops the helper process for each node.
 *
 * @param cls closure.
-* @param cmd CMD being run.
 * @param is interpreter state.
 */
 static void
 stop_testing_system_run (void *cls,
-                         const struct GNUNET_TESTING_Command *cmd,
                          struct GNUNET_TESTING_Interpreter *is)
 {
   struct StopHelperState *shs = cls;
   struct GNUNET_HELPER_Handle **helper;
   const struct GNUNET_TESTING_Command *start_helper_cmd;
 
-  start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command (
-    shs->helper_start_label);
+  start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command (NULL,
+                                                                shs->
+                                                                helper_start_label);
   GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd,
                                            &helper);
 
-  for (int i = 1; i <= atoi (shs->global_n); i++)
+  for (int i = 1; i <= shs->known; i++)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "i: %u\n",
+                i);
+    GNUNET_HELPER_stop (helper[i - 1],
+                        GNUNET_YES);
+  }
+
+  for (int i = 1; i <= shs->global_n; i++)
   {
-    for (int j = 1; j <= atoi (shs->local_m); j++)
+    for (int j = 1; j <= shs->local_m; j++)
     {
-      GNUNET_HELPER_stop (helper[(i - 1) * atoi (shs->local_m) + j - 1],
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "i: %u j: %u\n",
+                  i,
+                  j);
+      GNUNET_HELPER_stop (helper[(i - 1) * shs->local_m + j + shs->known - 1],
                           GNUNET_YES);
     }
   }
@@ -110,26 +127,27 @@ stop_testing_system_run (void *cls,
 
 /**
  * Create command.
- * @param helper_start_label label of the cmd to start the test system.
+ *
  * @param label name for command.
- * @param .
- * @param local_m Number of nodes in a network namespace. //TODO make this a unsigned int
- * @param global_n Number of network namespaces. //TODO make this a unsigned int
+ * @param helper_start_label label of the cmd to start the test system.
+ * @param topology_config Configuration file for the test topology.
  * @return command.
  */
 struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_stop_testing_system (const char *label,
                                         const char *helper_start_label,
-                                        char *local_m,
-                                        char *global_n
-                                        )
+                                        const char *topology_config)
 {
   struct StopHelperState *shs;
 
+  struct GNUNET_TESTING_NetjailTopology *topology =
+    GNUNET_TESTING_get_topo_from_file (topology_config);
+
   shs = GNUNET_new (struct StopHelperState);
   shs->helper_start_label = helper_start_label;
-  shs->local_m = local_m;
-  shs->global_n = global_n;
+  shs->local_m = topology->nodes_m;
+  shs->global_n = topology->namespaces_n;
+  shs->known = topology->nodes_x;
 
   struct GNUNET_TESTING_Command cmd = {
     .cls = shs,