3 files changed, 192 insertions, 8 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 3ee2a070a..ca3ddceaa 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -61,6 +61,14 @@
 #include <byteswap.h>
 #endif
 
+
+/* This is also included in platform.h, but over there a couple of
+   GNUnet-specific gettext-related macros are defined in addition to including
+   the header file.  Because this header file uses gettext, this include
+   statement makes sure gettext macros are defined even when platform.h is
+   unavailable. */
+#include "gettext.h"
+
 #ifdef __cplusplus
 extern "C" {
 #if 0 /* keep Emacsens' auto-indent happy */
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index 939863d67..9ef42a3aa 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -47,6 +47,109 @@
   } while (0)
 
 
+/**
+ * Router of a network namespace.
+ */
+struct GNUNET_TESTING_NetjailRouter
+{
+  /**
+   * Will tcp be forwarded?
+   */
+  unsigned int tcp_port;
+
+  /**
+   * Will udp be forwarded?
+   */
+  unsigned int udp_port;
+};
+
+
+/**
+ * Node in the netjail topology.
+ */
+struct GNUNET_TESTING_NetjailNode
+{
+  /**
+   * Plugin for the test case to be run on this node.
+   */
+  char *plugin;
+
+  /**
+   * Flag indicating if this node is a global known node.
+   */
+  unsigned int is_global;
+
+  /**
+   * The number of the namespace this node is running in.
+   */
+  unsigned int namespace_n;
+
+  /**
+   * The number of this node in the namespace.
+   */
+  unsigned int node_n;
+};
+
+
+/**
+ * Namespace in a topology.
+ */
+struct GNUNET_TESTING_NetjailNamespace
+{
+  /**
+   * The number of the namespace.
+   */
+  unsigned int namespace_n;
+
+  /**
+   * Router of the namespace.
+   */
+  struct GNUNET_TESTING_NetjailRouter *router;
+
+  /**
+   * Hash map containing the nodes in this namespace.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *nodes;
+};
+
+/**
+ * Toplogy of our netjail setup.
+ */
+struct GNUNET_TESTING_NetjailTopology
+{
+
+  /**
+   * Default plugin for the test case to be run on nodes.
+   */
+  char *plugin;
+
+  /**
+   * Number of namespaces.
+   */
+  unsigned int namespaces_n;
+
+  /**
+   * Number of nodes per namespace.
+   */
+  unsigned int nodes_m;
+
+  /**
+   * Number of global known nodes per namespace.
+   */
+  unsigned int nodes_x;
+
+  /**
+   * Hash map containing the namespaces (for natted nodes) of the topology.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *map_namespaces;
+
+  /**
+   * Hash map containing the global known nodes which are not natted.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *map_globals;
+};
+
+
 /* ******************* Generic interpreter logic ************ */
 
 /**
@@ -456,6 +559,16 @@ struct GNUNET_TESTING_Timer
 
 
 /**
+ * Getting the topology from file.
+ *
+ * @param filename The name of the topology file.
+ * @return The GNUNET_TESTING_NetjailTopology
+ */
+struct GNUNET_TESTING_NetjailTopology *
+GNUNET_TESTING_get_topo_from_file (const char *filename);
+
+
+/**
  * Obtain performance data from the interpreter.
  *
  * @param timers what commands (by label) to obtain runtimes for
@@ -853,7 +966,8 @@ GNUNET_TESTING_cmd_system_destroy (const char *label,
  * Create command.
  *
  * @param label name for command.
- * @param binaryname to start.
+ * @param local_m Number of local nodes in each namespace.
+ * @param global_n The number of namespaces.
  * @return command.
  */
 struct GNUNET_TESTING_Command
@@ -861,6 +975,17 @@ GNUNET_TESTING_cmd_netjail_start (const char *label,
                                   char *local_m,
                                   char *global_n);
 
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param topology_config Configuration file for the test topology.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start_v2 (const char *label,
+                                     char *topology_config);
+
 
 /**
  * Create command.
@@ -880,6 +1005,20 @@ GNUNET_TESTING_cmd_netjail_start_testing_system (const char *label,
 /**
  * Create command.
  *
+ * @param label Name for the command.
+ * @param topology_config Configuration file for the test topology.
+ * @param rv Pointer to the return value of the test.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start_testing_system_v2 (const char *label,
+                                                    const char *topology_config,
+                                                    unsigned int *rv);
+
+
+/**
+ * Create command.
+ *
  * @param label name for command.
  * @param binaryname to stop.
  * @return command.
@@ -890,12 +1029,36 @@ GNUNET_TESTING_cmd_netjail_stop (const char *label,
                                  char *global_n);
 
 
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param topology_config Configuration file for the test topology.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_stop_v2 (const char *label,
+                                    char *topology_config);
+
+
 struct GNUNET_TESTING_Command
 GNUNET_TESTING_cmd_stop_testing_system (const char *label,
                                         const char *helper_start_label,
                                         char *local_m,
                                         char *global_n);
 
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param topology_config Configuration file for the test topology.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stop_testing_system_v2 (const char *label,
+                                           const char *helper_start_label,
+                                           const char *topology_config);
+
 
 int
 GNUNET_TESTING_get_trait_helper_handles (const struct
@@ -903,11 +1066,31 @@ GNUNET_TESTING_get_trait_helper_handles (const struct
                                          struct GNUNET_HELPER_Handle ***helper);
 
 
+/**
+ * Offer handles to testing cmd helper from trait
+ *
+ * @param cmd command to extract the message from.
+ * @param pt pointer to message.
+ * @return #GNUNET_OK on success.
+ */
+int
+GNUNET_TESTING_get_trait_helper_handles_v2 (const struct
+                                            GNUNET_TESTING_Command *cmd,
+                                            struct GNUNET_HELPER_Handle ***
+                                            helper);
+
+
 struct GNUNET_TESTING_Command
 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);
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index 0562e2183..f5d4c4ee0 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -116,13 +116,6 @@ GNUNET_TRANSPORT_application_validate (
   enum GNUNET_NetworkType nt,
   const char *addr);
 
-int
-GNUNET_TRANSPORT_get_trait_application_handle (const struct
-                                               GNUNET_TESTING_Command *cmd,
-                                               struct
-                                               GNUNET_TRANSPORT_ApplicationHandle
-                                               **ah);
-
 /** @} */ /* end of group */
 
 #endif