1 files changed, 135 insertions, 60 deletions

diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index b578219ca..8889f9d06 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -37,28 +37,33 @@
 
 #define BASE_DIR "testdir"
 
-/**
- * The name for a specific test environment directory.
- *
- */
-char *testdir;
 
-/**
- * The name for the configuration file of the specific node.
- *
- */
-char *cfgname;
+struct TestState
+{
+  /**
+   * Callback to write messages to the master loop.
+   *
+   */
+  TESTING_CMD_HELPER_write_cb write_message;
 
-/**
- * Flag indicating if all peers have been started.
- *
- */
-unsigned int are_all_peers_started;
+  /**
+   * The name for a specific test environment directory.
+   *
+   */
+  char *testdir;
 
-/**
- * Flag indicating a received message.
- */
-unsigned int message_received;
+  /**
+   * The name for the configuration file of the specific node.
+   *
+   */
+  char *cfgname;
+};
+
+static struct GNUNET_TESTING_Command block_send;
+
+static struct GNUNET_TESTING_Command block_receive;
+
+static struct GNUNET_TESTING_Command connect_peers;
 
 
 /**
@@ -83,7 +88,14 @@ static void
 handle_test (void *cls,
              const struct GNUNET_TRANSPORT_TESTING_TestMessage *message)
 {
-  message_received = GNUNET_YES;
+  struct GNUNET_TESTING_AsyncContext *ac;
+
+  GNUNET_TESTING_get_trait_async_context (&block_receive,
+                                          &ac);
+  if ((NULL == ac) || (NULL == ac->cont))
+    GNUNET_TESTING_async_fail (ac);
+  else
+    GNUNET_TESTING_async_finish (ac);
 }
 
 
@@ -94,7 +106,62 @@ handle_test (void *cls,
 static void
 all_peers_started ()
 {
-  are_all_peers_started = GNUNET_YES;
+  struct GNUNET_TESTING_AsyncContext *ac;
+
+  GNUNET_TESTING_get_trait_async_context (&block_send,
+                                          &ac);
+  if ((NULL == ac) || (NULL == ac->cont))
+    GNUNET_TESTING_async_fail (ac);
+  else
+    GNUNET_TESTING_async_finish (ac);
+}
+
+
+/**
+ * Function called with the final result of the test.
+ *
+ * @param cls the `struct MainParams`
+ * @param rv #GNUNET_OK if the test passed
+ */
+static void
+handle_result (void *cls,
+               enum GNUNET_GenericReturnValue rv)
+{
+  struct TestState *ts = cls;
+  struct GNUNET_MessageHeader *reply;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Local test exits with status %d\n",
+              rv);
+  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
+
+  ts->write_message (reply,
+                     ntohs (reply->size));
+  GNUNET_free (ts->testdir);
+  GNUNET_free (ts->cfgname);
+  GNUNET_free (ts);
+}
+
+
+/**
+ * Callback from start peer cmd for signaling a peer got connected.
+ *
+ */
+static void *
+notify_connect (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+                struct GNUNET_MQ_Handle *mq)
+{
+  struct ConnectPeersState *cps;
+
+  GNUNET_TESTING_get_trait_connect_peer_state (&connect_peers,
+                                               &cps);
+  void *ret = NULL;
+
+  cps->notify_connect (cps,
+                       peer,
+                       mq);
+  return ret;
 }
 
 
@@ -116,24 +183,46 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *local_m)
 {
 
-  GNUNET_asprintf (&cfgname,
-                   "test_transport_api2_tcp_node%s.conf",
-                   "1");
+  unsigned int n_int;
+  unsigned int m_int;
+  unsigned int local_m_int;
+  unsigned int num;
+  struct TestState *ts = GNUNET_new (struct TestState);
+  struct GNUNET_TESTING_NetjailTopology *topology =
+    GNUNET_TESTING_get_topo_from_file (TOPOLOGY_CONFIG);
+
+  if (0 == m_int)
+    num = n_int;
+  else
+    num = (n_int - 1) * local_m_int + m_int + topology->nodes_x;
+
+  block_send = GNUNET_TESTING_cmd_block_until_external_trigger ("block");
+  block_receive = GNUNET_TESTING_cmd_block_until_external_trigger (
+    "block-receive");
+  connect_peers = GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers",
+                                                      "start-peer",
+                                                      "system-create",
+                                                      num,
+                                                      NULL);
+
+
+
+  sscanf (m, "%u", &m_int);
+  sscanf (n, "%u", &n_int);
+  sscanf (local_m, "%u", &local_m_int);
+
+  GNUNET_asprintf (&ts->cfgname,
+                   "test_transport_api2_tcp_node1.conf");
 
   LOG (GNUNET_ERROR_TYPE_ERROR,
        "plugin cfgname: %s\n",
-       cfgname);
+       ts->cfgname);
 
   LOG (GNUNET_ERROR_TYPE_ERROR,
        "node ip: %s\n",
        node_ip);
 
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "m: %s n: %s\n",
-       m,
-       n);
-
-  GNUNET_asprintf (&testdir,
+  GNUNET_asprintf (&ts->testdir,
                    "%s%s%s",
                    BASE_DIR,
                    m,
@@ -143,50 +232,38 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
     GNUNET_MQ_hd_var_size (test,
                            GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE,
                            struct GNUNET_TRANSPORT_TESTING_TestMessage,
-                           NULL),
+                           ts),
     GNUNET_MQ_handler_end ()
   };
 
   struct GNUNET_TESTING_Command commands[] = {
     GNUNET_TESTING_cmd_system_create ("system-create",
-                                      testdir),
+                                      ts->testdir),
     GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
                                      "system-create",
-                                     m,
-                                     n,
-                                     local_m,
+                                     num,
                                      node_ip,
                                      handlers,
-                                     cfgname),
+                                     ts->cfgname,
+                                     notify_connect),
     GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
                                         write_message),
-    GNUNET_TESTING_cmd_block_until_all_peers_started ("block",
-                                                      &are_all_peers_started),
-    GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers",
-                                        "start-peer",
-                                        "system-create",
-                                        (atoi (n) - 1) * atoi (local_m) + atoi (
-                                          m)),
+    block_send,
+    connect_peers,
     GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
-                                      m,
-                                      n,
-                                      (atoi (n) - 1) * atoi (local_m) + atoi (
-                                        m),
-                                      "start-peer"),
-    GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
-                                                     &message_received),
+                                      "start-peer",
+                                      num),
+    block_receive,
     GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
                                     "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",
-                                       "system-create"),
-    GNUNET_TESTING_cmd_local_test_finished ("local-test-finished",
-                                            write_message),
-    GNUNET_TESTING_cmd_end_without_shutdown ()
+                                       "system-create")
   };
 
-  GNUNET_TESTING_run (NULL,
-                      commands,
-                      GNUNET_TIME_UNIT_FOREVER_REL);
+  GNUNET_TESTING_run (commands,
+                      GNUNET_TIME_UNIT_FOREVER_REL,
+                      &handle_result,
+                      ts);
 
 }
 
@@ -225,8 +302,6 @@ libgnunet_test_transport_plugin_cmd_simple_send_done (void *cls)
   struct GNUNET_TESTING_PluginFunctions *api = cls;
 
   GNUNET_free (api);
-  GNUNET_free (testdir);
-  GNUNET_free (cfgname);
   return NULL;
 }