1 files changed, 37 insertions, 25 deletions

diff --git a/src/include/gnunet_testing_netjail_lib.h b/src/include/gnunet_testing_netjail_lib.h
index f736e1b42..4f52f5af0 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/include/gnunet_testing_netjail_lib.h
@@ -145,6 +145,16 @@ struct GNUNET_TESTING_NodeConnection
 struct GNUNET_TESTING_NetjailNode
 {
   /**
+   * Head of the DLL with the connections which shall be established to other nodes.
+   */
+  struct GNUNET_TESTING_NodeConnection *node_connections_head;
+
+  /**
+   * Tail of the DLL with the connections which shall be established to other nodes.
+   */
+  struct GNUNET_TESTING_NodeConnection *node_connections_tail;
+
+  /**
    * Plugin for the test case to be run on this node.
    */
   char *plugin;
@@ -165,19 +175,19 @@ struct GNUNET_TESTING_NetjailNode
   unsigned int node_n;
 
   /**
-   * The number of unintentional additional connections this node waits for. This overwrites the global additional_connects value.
+   * The overall number of the node in the whole test system.
    */
-  unsigned int additional_connects;
+  unsigned int node_number;
 
   /**
-   * Head of the DLL with the connections which shall be established to other nodes.
+   * The number of unintentional additional connections this node waits for. This overwrites the global additional_connects value.
    */
-  struct GNUNET_TESTING_NodeConnection *node_connections_head;
+  unsigned int additional_connects;
 
   /**
-   * Tail of the DLL with the connections which shall be established to other nodes.
+   * The number of cmds waiting for a specific barrier.
    */
-  struct GNUNET_TESTING_NodeConnection *node_connections_tail;
+  unsigned int expected_reaches;
 };
 
 
@@ -275,6 +285,17 @@ GNUNET_TESTING_get_additional_connects (unsigned int num,
                                         struct GNUNET_TESTING_NetjailTopology *
                                         topology);
 
+/**
+ * Get a node from the topology.
+ *
+ * @param num The specific node we want the connections for.
+ * @param topology The topology we get the connections from.
+ * @return The connections of the node.
+ */
+struct GNUNET_TESTING_NetjailNode *
+GNUNET_TESTING_get_node (unsigned int num,
+                         struct GNUNET_TESTING_NetjailTopology *topology);
+
 
 /**
  * Get the connections to other nodes for a specific node.
@@ -323,6 +344,16 @@ GNUNET_TESTING_calculate_num (struct
 struct TestState
 {
   /**
+   * The head of the DLL with barriers of the test case.
+   */
+  struct GNUNET_TESTING_Barrier *barriers_head;
+
+  /**
+   * The tail of the DLL with barriers of the test case.
+   */
+  struct GNUNET_TESTING_Barrier *barriers_tail;
+
+  /**
    * Callback to write messages to the master loop.
    *
    */
@@ -480,25 +511,6 @@ GNUNET_TESTING_send_local_test_finished_msg ();
 
 
 struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_create (
-  const char *label);
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_setup_finished (
-  const char *label);
-
-
-// Wait for barrier to be reached by all;
-// async version implies reached but does not
-// wait on other peers to reach it.
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_reached (
-  const char *label,
-  const char *barrier_label);
-
-
-struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_block_until_all_peers_started (
   const char *label,
   unsigned int *all_peers_started);