1 files changed, 71 insertions, 48 deletions

diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
index 0631f7051..9c34c50d7 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -46,21 +46,18 @@ struct SendSimpleState
    *
    */
   const char *start_peer_label;
-};
 
+  /**
+   * Label of the cmd which started the test system.
+   *
+   */
+  const char *create_label;
 
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-send_simple_traits (void *cls,
-                    const void **ret,
-                    const char *trait,
-                    unsigned int index)
-{
-  return GNUNET_OK;
-}
+  /**
+   * The topology we get the connected nodes from.
+   */
+  struct GNUNET_TESTING_NetjailTopology *topology;
+};
 
 
 /**
@@ -77,7 +74,7 @@ send_simple_cleanup (void *cls)
 
 
 /**
- * The run method of this cmd will send a simple message to the connected peer.
+ * The run method of this cmd will send a simple message to the connected peers.
  *
  */
 static void
@@ -92,31 +89,54 @@ send_simple_run (void *cls,
   const struct GNUNET_TESTING_Command *peer1_cmd;
   struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
   struct GNUNET_HashCode hc;
-  int node_number;
+  struct GNUNET_TESTING_NodeConnection *node_connections_head;
+  struct GNUNET_PeerIdentity *peer;
+  struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+  uint32_t num;
+  struct GNUNET_TESTING_NodeConnection *pos_connection;
+  const struct GNUNET_TESTING_Command *system_cmd;
+  struct GNUNET_TESTING_System *tl_system;
 
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                          sss->start_peer_label);
   GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd,
                                                   &connected_peers_map);
 
-  node_number = 1;
-  GNUNET_CRYPTO_hash (&node_number, sizeof(node_number), &hc);
-  memcpy (key,
-          &hc,
-          sizeof (*key));
-
-  mq = GNUNET_CONTAINER_multishortmap_get (connected_peers_map,
-                                           key);
-
-  env = GNUNET_MQ_msg_extra (test,
-                             2600 - sizeof(*test),
-                             GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
-  test->num = htonl (sss->num);
-  memset (&test[1],
-          sss->num,
-          2600 - sizeof(*test));
-  GNUNET_MQ_send (mq,
-                  env);
+  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                          sss->create_label);
+  GNUNET_TESTING_get_trait_test_system (system_cmd,
+                                        &tl_system);
+
+  node_connections_head = GNUNET_TESTING_get_connections (sss->num,
+                                                          sss->topology);
+
+  for (int i = 0; i < 1; i++)
+  {
+    for (pos_connection = node_connections_head; NULL != pos_connection;
+         pos_connection = pos_connection->next)
+    {
+      num = GNUNET_TESTING_calculate_num (pos_connection, sss->topology);
+      peer = GNUNET_TESTING_get_pub_key (num, tl_system);
+      public_key = peer->public_key;
+      GNUNET_CRYPTO_hash (&public_key, sizeof(public_key), &hc);
+
+      memcpy (key,
+              &hc,
+              sizeof (*key));
+      mq = GNUNET_CONTAINER_multishortmap_get (connected_peers_map,
+                                               key);
+      env = GNUNET_MQ_msg_extra (test,
+                                 1000 - sizeof(*test),
+                                 GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE);
+      test->num = htonl (sss->num);
+      memset (&test[1],
+              sss->num,
+              1000 - sizeof(*test));
+      GNUNET_MQ_send (mq,
+                      env);
+    }
+  }
+
   GNUNET_free (key);
 
 }
@@ -126,31 +146,34 @@ send_simple_run (void *cls,
  * Create command.
  *
  * @param label name for command.
- * @param m The number of the local node of the actual network namespace.
- * @param n The number of the actual namespace.
- * @param num Number globally identifying the node.
  * @param start_peer_label Label of the cmd to start a peer.
+ * @param start_peer_label Label of the cmd which started the test system.
+ * @param num Number globally identifying the node.
+ * @param The topology for the test setup.
  * @return command.
  */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_send_simple (const char *label,
                                   const char *start_peer_label,
-                                  uint32_t num)
+                                  const char *create_label,
+                                  uint32_t num,
+                                  struct GNUNET_TESTING_NetjailTopology *
+                                  topology)
 {
   struct SendSimpleState *sss;
 
   sss = GNUNET_new (struct SendSimpleState);
   sss->num = num;
   sss->start_peer_label = start_peer_label;
-  {
-    struct GNUNET_TESTING_Command cmd = {
-      .cls = sss,
-      .label = label,
-      .run = &send_simple_run,
-      .cleanup = &send_simple_cleanup,
-      .traits = &send_simple_traits
-    };
-
-    return cmd;
-  }
+  sss->create_label = create_label;
+  sss->topology = topology;
+
+  struct GNUNET_TESTING_Command cmd = {
+    .cls = sss,
+    .label = label,
+    .run = &send_simple_run,
+    .cleanup = &send_simple_cleanup
+  };
+
+  return cmd;
 }