4 files changed, 41 insertions, 1 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 8e6e8b1be..1d33d986d 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -3549,6 +3549,26 @@ extern "C" {
 
 /*********************************************************************************/
 
+/*********************************************************************************/
+/**********************************  Cmd Testing  **********************************/
+/*********************************************************************************/
+
+/**
+ * The initialization message towards gnunet-cmds-helper
+ */
+#define GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT 1700
+
+/**
+ * The reply message from gnunet-cmds-helper
+ */
+#define GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY 1701
+
+#define GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED 1702
+
+#define GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED 1703
+
+/*********************************************************************************/
+
 /**
  * Type used to match 'all' message types.
  */
diff --git a/src/include/gnunet_testbed_ng_service.h b/src/include/gnunet_testbed_ng_service.h
index 9845b3be6..2ea5e616c 100644
--- a/src/include/gnunet_testbed_ng_service.h
+++ b/src/include/gnunet_testbed_ng_service.h
@@ -265,4 +265,13 @@ int
 GNUNET_TESTBED_get_trait_hosts (const struct
                                 GNUNET_TESTING_Command *cmd,
                                 struct GNUNET_TESTBED_Host ***hosts);
+
+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_send_peer_ready (const char *label,
+                                    TESTBED_CMD_HELPER_write_cb write_message);
 #endif
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
index a794562a9..8927fd4f1 100644
--- a/src/include/gnunet_testing_ng_lib.h
+++ b/src/include/gnunet_testing_ng_lib.h
@@ -28,6 +28,7 @@
 #define GNUNET_TESTING_NG_LIB_H
 
 #include "gnunet_util_lib.h"
+#include "gnunet_testing_plugin.h"
 
 
 /* ********************* Helper functions ********************* */
diff --git a/src/include/gnunet_testing_plugin.h b/src/include/gnunet_testing_plugin.h
index 527f509ad..6a54cacd2 100644
--- a/src/include/gnunet_testing_plugin.h
+++ b/src/include/gnunet_testing_plugin.h
@@ -36,9 +36,17 @@ extern "C"
 #endif
 #endif
 
+typedef void
+(*TESTBED_CMD_HELPER_write_cb) (struct GNUNET_MessageHeader *message, size_t
+                                msg_length);
+
+typedef void
+(*GNUNET_TESTING_PLUGIN_StartTestCase) (TESTBED_CMD_HELPER_write_cb
+                                        write_message, char *router_ip,
+                                        char *node_ip);
 
 typedef void
-(*GNUNET_TESTING_PLUGIN_StartTestCase) ();
+(*GNUNET_TESTING_PLUGIN_ALL_PEERS_STARTED) ();
 
 struct GNUNET_TESTING_PluginFunctions
 {
@@ -48,6 +56,8 @@ struct GNUNET_TESTING_PluginFunctions
   void *cls;
 
   GNUNET_TESTING_PLUGIN_StartTestCase start_testcase;
+
+  GNUNET_TESTING_PLUGIN_ALL_PEERS_STARTED all_peers_started;
 };
 
 #if 0                           /* keep Emacsens' auto-indent happy */