1 files changed, 27 insertions, 2 deletions

diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index 5941a991b..c9acb0431 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -30,6 +30,7 @@
 #include "gnunet_transport_application_service.h"
 #include "transport-testing2.h"
 #include "transport-testing-cmds.h"
+#include "gnunet_testing_barrier.h"
 
 /**
  * Generic logging shortcut
@@ -40,6 +41,8 @@
 
 #define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
 
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+
 static struct GNUNET_TESTING_Command block_send;
 
 static struct GNUNET_TESTING_Command block_receive;
@@ -48,6 +51,7 @@ static struct GNUNET_TESTING_Command connect_peers;
 
 static struct GNUNET_TESTING_Command local_prepared;
 
+static struct GNUNET_TESTING_Interpreter *is;
 
 /**
  * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -83,6 +87,25 @@ handle_test (void *cls,
 }
 
 
+struct GNUNET_TESTING_Barrier *
+get_waiting_for_barriers ()
+{
+  struct GNUNET_TESTING_Barrier *barrier;
+
+  //No Barrier
+  return NULL;
+}
+
+
+static void
+barrier_advanced (const char *barrier_name)
+{
+  struct GNUNET_TESTING_Barrier *barrier = GNUNET_TESTING_get_barrier (is, barrier_name);
+
+  GNUNET_TESTING_finish_attached_cmds (is, barrier);
+}
+
+
 /**
  * Callback to set the flag indicating all peers started. Will be called via the plugin api.
  *
@@ -312,8 +335,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
 
   ts->write_message = write_message;
 
-  GNUNET_TESTING_run (commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL,
+  is = GNUNET_TESTING_run (commands,
+                      TIMEOUT,
                       &handle_result,
                       ts);
 
@@ -339,6 +362,8 @@ libgnunet_test_transport_plugin_cmd_simple_send_init (void *cls)
   api->start_testcase = &start_testcase;
   api->all_peers_started = &all_peers_started;
   api->all_local_tests_prepared = all_local_tests_prepared;
+  api->barrier_advanced = barrier_advanced;
+  api->get_waiting_for_barriers = get_waiting_for_barriers;
   return api;
 }