1 files changed, 42 insertions, 29 deletions

diff --git a/src/testing/testing_api_cmd_netjail_start.c b/src/testing/testing_api_cmd_netjail_start.c
index 9cd84cb4f..35fb90f3c 100644
--- a/src/testing/testing_api_cmd_netjail_start.c
+++ b/src/testing/testing_api_cmd_netjail_start.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/testing_api_cmd_hello_world.c
+ * @file testing/testing_api_cmd_netjail_start.c
  * @brief Command to start the netjail script.
  * @author t3sserakt
  */
@@ -43,16 +43,16 @@ struct NetJailState
   // Child Wait handle
   struct GNUNET_ChildWaitHandle *cwh;
 
-  // Number of local nodes in each namespace.
-  char *local_m;
-
-  // The number of namespaces.
-  char *global_n;
-
   /**
    * The process id of the start script.
    */
   struct GNUNET_OS_Process *start_proc;
+
+  /**
+   * Configuration file for the test topology.
+   */
+  char *topology_config;
+
 };
 
 
@@ -67,6 +67,7 @@ netjail_start_cleanup (void *cls)
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "netjail_start_cleanup!\n");
+
   if (NULL != ns->cwh)
   {
     GNUNET_wait_child_cancel (ns->cwh);
@@ -105,9 +106,9 @@ child_completed_callback (void *cls,
   }
   else
   {
-    // FIXME: log status code
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Child completed with an error!\n");
+                "Child failed with error %lu!\n",
+                exit_code);
     GNUNET_TESTING_async_fail (&ns->ac);
   }
 }
@@ -124,13 +125,13 @@ netjail_start_run (void *cls,
                    struct GNUNET_TESTING_Interpreter *is)
 {
   struct NetJailState *ns = cls;
-  char *const script_argv[] = {
-    NETJAIL_START_SCRIPT,
-    ns->local_m,
-    ns->global_n,
-    NULL
-  };
-  unsigned int helper_check = GNUNET_OS_check_helper_binary (
+  char pid[15];
+  enum GNUNET_GenericReturnValue helper_check;
+
+  // FIXME: NETJAIL_START_SCRIPT like this is bad,
+  // use location from share/gnunet/ of installed
+  // binary in case libgnunettesting is used as a lib!
+  helper_check = GNUNET_OS_check_helper_binary (
     NETJAIL_START_SCRIPT,
     GNUNET_YES,
     NULL);
@@ -141,22 +142,37 @@ netjail_start_run (void *cls,
                 "No SUID for %s!\n",
                 NETJAIL_START_SCRIPT);
     GNUNET_TESTING_interpreter_fail (is);
+    return;
   }
-  else if (GNUNET_NO == helper_check)
+  if (GNUNET_SYSERR == helper_check)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "%s not found!\n",
                 NETJAIL_START_SCRIPT);
     GNUNET_TESTING_interpreter_fail (is);
+    return;
   }
 
-  ns->start_proc = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
-                                                NULL,
-                                                NULL,
-                                                NULL,
-                                                NETJAIL_START_SCRIPT,
-                                                script_argv);
+  GNUNET_snprintf (pid,
+                   sizeof (pid),
+                   "%u",
+                   getpid ());
+  {
+    char *const script_argv[] = {
+      NETJAIL_START_SCRIPT,
+      ns->topology_config,
+      pid,
+      NULL
+    };
 
+    ns->start_proc
+      = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
+                                     NULL,
+                                     NULL,
+                                     NULL,
+                                     NETJAIL_START_SCRIPT,
+                                     script_argv);
+  }
   ns->cwh = GNUNET_wait_child (ns->start_proc,
                                &child_completed_callback,
                                ns);
@@ -168,20 +184,17 @@ netjail_start_run (void *cls,
  * Create command.
  *
  * @param label name for command.
- * @param local_m Number of local nodes in each namespace.
- * @param global_n The number of namespaces.
+ * @param topology_config Configuration file for the test topology.
  * @return command.
  */
 struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_netjail_start (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;
+  ns->topology_config = topology_config;
   {
     struct GNUNET_TESTING_Command cmd = {
       .cls = ns,