1 files changed, 38 insertions, 78 deletions

diff --git a/src/testing/testing_api_cmd_netjail_stop.c b/src/testing/testing_api_cmd_netjail_stop.c
index 99084d9af..5033272a3 100644
--- a/src/testing/testing_api_cmd_netjail_stop.c
+++ b/src/testing/testing_api_cmd_netjail_stop.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/testing_api_cmd_hello_world.c
+ * @file testing/testing_api_cmd_netjail_stop.c
  * @brief Command to stop the netjail script.
  * @author t3sserakt
  */
@@ -31,7 +31,7 @@
 #define NETJAIL_STOP_SCRIPT "./../testing/netjail_stop.sh"
 
 // Child Wait handle
-struct GNUNET_ChildWaitHandle *cwh;
+static struct GNUNET_ChildWaitHandle *cwh;
 
 /**
  * Struct to hold information for callbacks.
@@ -39,19 +39,21 @@ struct GNUNET_ChildWaitHandle *cwh;
  */
 struct NetJailState
 {
-  // Number of local nodes in each namespace.
-  char *local_m;
+  /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
 
-  // The number of namespaces.
-  char *global_n;
+  /**
+   * Configuration file for the test topology.
+   */
+  char *topology_config;
 
   /**
    * The process id of the start script.
    */
   struct GNUNET_OS_Process *stop_proc;
 
-  // Flag indication if the script finished.
-  unsigned int finished;
 };
 
 
@@ -60,8 +62,7 @@ struct NetJailState
  *
  */
 static void
-netjail_stop_cleanup (void *cls,
-                      const struct GNUNET_TESTING_Command *cmd)
+netjail_stop_cleanup (void *cls)
 {
   struct NetJailState *ns = cls;
 
@@ -84,20 +85,6 @@ netjail_stop_cleanup (void *cls,
 
 
 /**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-netjail_stop_traits (void *cls,
-                     const void **ret,
-                     const char *trait,
-                     unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
  * Callback which will be called if the setup script finished.
  *
  */
@@ -108,17 +95,17 @@ child_completed_callback (void *cls,
 {
   struct NetJailState *ns = cls;
 
-  cwh = NULL;
+  cwh = NULL; // WTF? globals!?!?!
+  GNUNET_OS_process_destroy (ns->stop_proc);
+  ns->stop_proc = NULL;
   if (0 == exit_code)
   {
-    ns->finished = GNUNET_YES;
+    GNUNET_TESTING_async_finish (&ns->ac);
   }
   else
   {
-    ns->finished = GNUNET_SYSERR;
+    GNUNET_TESTING_async_fail (&ns->ac);
   }
-  GNUNET_OS_process_destroy (ns->stop_proc);
-  ns->stop_proc = NULL;
 }
 
 
@@ -126,18 +113,21 @@ child_completed_callback (void *cls,
 * The run method starts the script which deletes the network namespaces.
 *
 * @param cls closure.
-* @param cmd CMD being run.
 * @param is interpreter state.
 */
 static void
 netjail_stop_run (void *cls,
-                  const struct GNUNET_TESTING_Command *cmd,
                   struct GNUNET_TESTING_Interpreter *is)
 {
   struct NetJailState *ns = cls;
+  char *pid;
+
+  GNUNET_asprintf (&pid,
+                   "%u",
+                   getpid ());
   char *const script_argv[] = {NETJAIL_STOP_SCRIPT,
-                               ns->local_m,
-                               ns->global_n,
+                               ns->topology_config,
+                               pid,
                                NULL};
   unsigned int helper_check = GNUNET_OS_check_helper_binary (
     NETJAIL_STOP_SCRIPT,
@@ -149,14 +139,14 @@ netjail_stop_run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No SUID for %s!\n",
                 NETJAIL_STOP_SCRIPT);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
   }
   else if (GNUNET_NO == helper_check)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "%s not found!\n",
                 NETJAIL_STOP_SCRIPT);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
   }
 
   ns->stop_proc = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
@@ -170,56 +160,26 @@ netjail_stop_run (void *cls,
                            &child_completed_callback,
                            ns);
   GNUNET_break (NULL != cwh);
-
 }
 
 
-/**
- * This function checks the flag NetJailState#finished, if this cmd finished.
- *
- */
-static int
-netjail_stop_finish (void *cls,
-                     GNUNET_SCHEDULER_TaskCallback cont,
-                     void *cont_cls)
-{
-  struct NetJailState *ns = cls;
-
-  if (ns->finished)
-  {
-    cont (cont_cls);
-  }
-  return ns->finished;
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param local_m Number of local nodes in each namespace.
- * @param global_n The number of namespaces.
- * @return command.
- */
 struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_netjail_stop (const char *label,
-                                 char *local_m,
-                                 char *global_n)
+                                 char *topology_config)
 {
   struct NetJailState *ns;
 
   ns = GNUNET_new (struct NetJailState);
-  ns->local_m = local_m;
-  ns->global_n = global_n;
-
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = ns,
-    .label = label,
-    .run = &netjail_stop_run,
-    .finish = &netjail_stop_finish,
-    .cleanup = &netjail_stop_cleanup,
-    .traits = &netjail_stop_traits
-  };
-
-  return cmd;
+  ns->topology_config = topology_config;
+  {
+    struct GNUNET_TESTING_Command cmd = {
+      .cls = ns,
+      .label = label,
+      .run = &netjail_stop_run,
+      .ac = &ns->ac,
+      .cleanup = &netjail_stop_cleanup
+    };
+
+    return cmd;
+  }
 }