Browse Source

- fixed wrong dependencies to tng version of libs, added missing block after sending

t3sserakt 2 years ago
parent
commit
9bdaa1f9b2

+ 8 - 0
po/POTFILES.in

@@ -429,8 +429,12 @@ src/testing/testing_api_cmd_hello_world_birth.c
 src/testing/testing_api_cmd_local_test_finished.c
 src/testing/testing_api_cmd_netjail_start.c
 src/testing/testing_api_cmd_netjail_start_testsystem.c
+src/testing/testing_api_cmd_netjail_start_testsystem_v2.c
+src/testing/testing_api_cmd_netjail_start_v2.c
 src/testing/testing_api_cmd_netjail_stop.c
 src/testing/testing_api_cmd_netjail_stop_testsystem.c
+src/testing/testing_api_cmd_netjail_stop_testsystem_v2.c
+src/testing/testing_api_cmd_netjail_stop_v2.c
 src/testing/testing_api_cmd_send_peer_ready.c
 src/testing/testing_api_cmd_system_create.c
 src/testing/testing_api_cmd_system_destroy.c
@@ -491,8 +495,11 @@ src/transport/transport_api2_monitor.c
 src/transport/transport_api_address_to_string.c
 src/transport/transport_api_blacklist.c
 src/transport/transport_api_cmd_connecting_peers.c
+src/transport/transport_api_cmd_connecting_peers_v2.c
 src/transport/transport_api_cmd_send_simple.c
+src/transport/transport_api_cmd_send_simple_v2.c
 src/transport/transport_api_cmd_start_peer.c
+src/transport/transport_api_cmd_start_peer_v2.c
 src/transport/transport_api_cmd_stop_peer.c
 src/transport/transport_api_core.c
 src/transport/transport_api_hello_get.c
@@ -510,6 +517,7 @@ src/util/common_allocation.c
 src/util/common_endian.c
 src/util/common_logging.c
 src/util/configuration.c
+src/util/configuration_helper.c
 src/util/consttime_memcmp.c
 src/util/container_bloomfilter.c
 src/util/container_heap.c

+ 6 - 0
src/include/gnunet_testing_ng_lib.h

@@ -1085,6 +1085,12 @@ GNUNET_TESTING_cmd_block_until_all_peers_started (const char *label,
                                                   unsigned int *
                                                   all_peers_started);
 
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_block_until_external_trigger (const char *label,
+                                                 unsigned int *
+                                                 stop_blocking);
+
 struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_send_peer_ready (const char *label,
                                     TESTING_CMD_HELPER_write_cb write_message);

+ 1 - 0
src/testing/Makefile.am

@@ -44,6 +44,7 @@ libgnunettesting_la_SOURCES = \
   testing_api_cmd_local_test_finished.c \
   testing_api_cmd_send_peer_ready.c \
   testing_api_cmd_block_until_all_peers_started.c \
+  testing_api_cmd_block_until_external_trigger.c \
   testing_api_cmd_netjail_start.c \
   testing_api_cmd_netjail_start_v2.c \
   testing_api_cmd_netjail_start_testsystem.c \

+ 139 - 0
src/testing/testing_api_cmd_block_until_external_trigger.c

@@ -0,0 +1,139 @@
+/*
+      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_api_cmd_block_until_all_peers_started.c
+ * @brief cmd to block the interpreter loop until all peers started.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_ng_lib.h"
+
+/**
+ * Generic logging shortcut
+ */
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
+
+/**
+ * Struct with information for callbacks.
+ *
+ */
+struct BlockState
+{
+  /**
+   * Flag to indicate if all peers have started.
+   *
+   */
+  unsigned int *stop_blocking;
+};
+
+
+/**
+ * Trait function of this cmd does nothing.
+ *
+ */
+static int
+block_until_all_peers_started_traits (void *cls,
+                                      const void **ret,
+                                      const char *trait,
+                                      unsigned int index)
+{
+  return GNUNET_OK;
+}
+
+
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
+static void
+block_until_all_peers_started_cleanup (void *cls,
+                                       const struct GNUNET_TESTING_Command *cmd)
+{
+  struct BlockState *bs = cls;
+
+  GNUNET_free (bs);
+}
+
+
+/**
+ * This function does nothing but to start the cmd.
+ *
+ */
+static void
+block_until_all_peers_started_run (void *cls,
+                                   const struct GNUNET_TESTING_Command *cmd,
+                                   struct GNUNET_TESTING_Interpreter *is)
+{
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "block_until_all_peers_started_run!\n");
+}
+
+
+/**
+ * Function to check if BlockState#all_peers_started is GNUNET_YES. In that case interpreter_next will be called.
+ *
+ */
+static int
+block_until_all_peers_started_finish (void *cls,
+                                      GNUNET_SCHEDULER_TaskCallback cont,
+                                      void *cont_cls)
+{
+  struct BlockState *bs = cls;
+  unsigned int *ret = bs->stop_blocking;
+
+  if (GNUNET_YES == *ret)
+  {
+    cont (cont_cls);
+  }
+
+  return *ret;
+}
+
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param all_peers_started Flag which will be set from outside.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_block_until_external_trigger (const char *label,
+                                                 unsigned int *
+                                                 stop_blocking)
+{
+  struct BlockState *bs;
+
+  bs = GNUNET_new (struct BlockState);
+  bs->stop_blocking = stop_blocking;
+
+  struct GNUNET_TESTING_Command cmd = {
+    .cls = bs,
+    .label = label,
+    .run = &block_until_all_peers_started_run,
+    .finish = &block_until_all_peers_started_finish,
+    .cleanup = &block_until_all_peers_started_cleanup,
+    .traits = &block_until_all_peers_started_traits
+  };
+
+  return cmd;
+}

+ 6 - 6
src/transport/Makefile.am

@@ -401,7 +401,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
 libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
-  libgnunettransport.la \
+  libgnunettransportcore.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -418,7 +418,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_v2_la_SOURCES = \
 libgnunet_test_transport_plugin_cmd_simple_send_v2_la_LIBADD = \
   libgnunettransporttesting2.la \
   libgnunettransportapplication.la \
-  libgnunettransport.la \
+  libgnunettransportcore.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -756,8 +756,8 @@ test_transport_simple_send_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransport.la \
- libgnunettransporttesting.la
+ libgnunettransportcore.la \
+ libgnunettransporttesting2.la
 
 test_transport_simple_send_v2_SOURCES = \
  test_transport_simple_send_v2.c
@@ -766,8 +766,8 @@ test_transport_simple_send_v2_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/hello/libgnunethello.la \
- libgnunettransport.la \
- libgnunettransporttesting.la
+ libgnunettransportcore.la \
+ libgnunettransporttesting2.la
 
 test_transport_testing_startstop_SOURCES = \
  test_transport_testing_startstop.c

+ 8 - 0
src/transport/test_transport_plugin_cmd_simple_send.c

@@ -55,6 +55,11 @@ char *cfgname;
  */
 unsigned int are_all_peers_started;
 
+/**
+ * Flag indicating a received message.
+ */
+unsigned int message_received;
+
 
 /**
  * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -80,6 +85,7 @@ handle_test (void *cls,
 {
   LOG (GNUNET_ERROR_TYPE_ERROR,
        "message received\n");
+  message_received = GNUNET_YES;
 }
 
 
@@ -203,6 +209,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                                       (atoi (n) - 1) * atoi (local_m) + atoi (
                                         m),
                                       "start-peer"),
+    GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
+                                                     &message_received),
     GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
                                     "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",

+ 8 - 36
src/transport/test_transport_plugin_cmd_simple_send_v2.c

@@ -57,6 +57,11 @@ char *cfgname;
  */
 unsigned int are_all_peers_started;
 
+/**
+ * Flag indicating a received message.
+ */
+unsigned int message_received;
+
 
 /**
  * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -80,35 +85,7 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "message received\n");
-}
-
-
-/**
- * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2
- * being received.
- *
- */
-static int
-check_test2 (void *cls,
-             const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called to handle a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2
- * being received.
- *
- */
-static void
-handle_test2 (void *cls,
-              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
-{
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "message received\n");
+  message_received = GNUNET_YES;
 }
 
 
@@ -120,9 +97,6 @@ static void
 all_peers_started ()
 {
   are_all_peers_started = GNUNET_YES;
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "setting are_all_peers_started: %d\n",
-       are_all_peers_started);
 }
 
 
@@ -181,10 +155,6 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                            GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
                            struct GNUNET_TRANSPORT_TESTING_TestMessage,
                            NULL),
-    GNUNET_MQ_hd_var_size (test2,
-                           GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE2,
-                           struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           NULL),
     GNUNET_MQ_handler_end ()
   };
 
@@ -208,6 +178,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
     GNUNET_TRANSPORT_cmd_send_simple_v2 ("send-simple",
                                          "start-peer",
                                          num),
+    GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
+                                                     &message_received),
     GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
                                     "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",