-taking a first stab at cleaning up the testing mess

3 files changed, 191 insertions, 33 deletions

diff --git a/src/dhtu/Makefile.am b/src/dhtu/Makefile.am
index 61ca84ee3..772bee60a 100644
--- a/src/dhtu/Makefile.am
+++ b/src/dhtu/Makefile.am
@@ -41,6 +41,21 @@ libgnunet_plugin_dhtu_gnunet_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 
+lib_LTLIBRARIES = \
+  libgnunettestingdhtu.la
+
+libgnunettestingdhtu_la_SOURCES = \
+  testing_dhtu_cmd_send.c
+libgnunettestingdhtu_la_LIBADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(LTLIBINTL)
+libgnunettestingdhtu_la_LDFLAGS = \
+ $(GN_LIB_LDFLAGS) \
+ -version-info 0:0:0
+
+
+
 test_dhtu_ip_SOURCES = \
  test_dhtu_ip.c
 test_dhtu_ip_LDADD = \
diff --git a/src/dhtu/test_dhtu_ip.c b/src/dhtu/test_dhtu_ip.c
index f350905b8..eb886e994 100644
--- a/src/dhtu/test_dhtu_ip.c
+++ b/src/dhtu/test_dhtu_ip.c
@@ -32,20 +32,9 @@
 #define CONFIG_FILE "test_dhtu_ip.conf"
 
 
-/**
- * Return value of the test.
- *
- */
-static int rv;
-
-
-/**
- * Main function to run the test cases.
- *
- * @param cls not used.
- */
-static void
-run (void *cls)
+int
+main (int argc,
+      char *const *argv)
 {
   struct GNUNET_TESTING_Command commands[] = {
     GNUNET_TESTING_cmd_netjail_start_v2 ("netjail-start",
@@ -55,23 +44,7 @@ run (void *cls)
     GNUNET_TESTING_cmd_end ()
   };
 
-  (void) cls;
-  if (GNUNET_OK !=
-      GNUNET_TESTING_run (NULL, /* config file */
-                          commands,
-                          TIMEOUT))
-  {
-    GNUNET_break (0);
-    rv = EXIT_FAILURE;
-  }
-}
-
-
-int
-main (int argc,
-      char *const *argv)
-{
-  GNUNET_SCHEDULER_run (&run,
-                        NULL);
-  return rv;
+  return GNUNET_TESTING_main (NULL,
+                              commands,
+                              TIMEOUT);
 }
diff --git a/src/dhtu/testing_dhtu_cmd_send.c b/src/dhtu/testing_dhtu_cmd_send.c
new file mode 100644
index 000000000..129a31205
--- /dev/null
+++ b/src/dhtu/testing_dhtu_cmd_send.c
@@ -0,0 +1,170 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_dhtu_cmd_send.c
+ * @brief use DHTU to send a message
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_testing_ng_lib.h"
+
+
+/**
+ * State for the 'send' command.
+ */
+struct SendState
+{
+
+  /**
+   * Function to call when done.
+   */
+  GNUNET_SCHEDULER_TaskCallback cont;
+
+  /**
+   * Closure for @e cont.
+   */
+  void *cont_cls;
+
+  enum GNUNET_GenericReturnValue finished;
+};
+
+
+/**
+ *
+ *
+ * @param cls a `struct SendState`
+ */
+static void
+send_cleanup (void *cls)
+{
+  struct SendState *ss = cls;
+
+  GNUNET_free (ss);
+}
+
+
+/**
+ * Return trains of the ``send`` command.
+ *
+ * @param cls closure.
+ * @param[out] ret result
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ *         #GNUNET_NO if no trait was found
+ */
+static enum GNUNET_GenericReturnValue
+send_traits (void *cls,
+             const void **ret,
+             const char *trait,
+             unsigned int index)
+{
+  return GNUNET_NO;
+}
+
+
+/**
+ * Run the 'send' command.
+ *
+ * @param cls closure.
+ * @param is interpreter state.
+ */
+static void
+send_run (void *cls,
+          struct GNUNET_TESTING_Interpreter *is)
+{
+  struct SendState *ss = cls;
+
+#if 0
+  other_cmd = GNUNET_TESTING_interpreter_lookup_command (ss->other_label);
+  GNUNET_TESTING_get_trait_XXX (other_cmd,
+                                &data);
+#endif
+  ss->finished = GNUNET_OK;
+}
+
+
+/**
+ * This function checks the flag NetJailState#finished, if this cmd finished.
+ *
+ * @param cls a `struct SendState`
+ * @param cont function to call upon completion, can be NULL
+ * @param cont_cls closure for @a cont
+ * @return
+ *    #GNUNET_NO if the command is still running and @a cont will be called later
+ *    #GNUNET_OK if the command completed successfully and @a cont was called
+ *    #GNUNET_SYSERR if the operation @a cont was NOT called
+ */
+static enum GNUNET_GenericReturnValue
+send_finish (void *cls,
+             GNUNET_SCHEDULER_TaskCallback cont,
+             void *cont_cls)
+{
+  struct SendState *ss = cls;
+
+  switch (ss->finished)
+  {
+  case GNUNET_OK:
+    cont (cont_cls);
+    break;
+  case GNUNET_SYSERR:
+    GNUNET_break (0);
+    break;
+  case GNUNET_NO:
+    if (NULL != ss->cont)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    ss->cont = cont;
+    ss->cont_cls = cont_cls;
+    break;
+  }
+  return ss->finished;
+}
+
+
+/**
+ * Create 'send' command.
+ *
+ * @param label name for command.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_DHTU_cmd_send (const char *label)
+{
+  struct SendState *ss;
+
+  ss = GNUNET_new (struct SendState);
+
+  {
+    struct GNUNET_TESTING_Command cmd = {
+      .cls = ss,
+      .label = label,
+      .run = &send_run,
+      .finish = &send_finish,
+      .cleanup = &send_cleanup,
+      .traits = &send_traits
+    };
+
+    return cmd;
+  }
+}