1 files changed, 37 insertions, 18 deletions

diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 3fef7d687..33faee296 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -91,17 +91,20 @@ connect_peers_run (void *cls,
     {
       addr = GNUNET_TESTING_get_address (pos_connection,
                                          pos_prefix->address_prefix);
-      peer = GNUNET_TESTING_get_pub_key (num, tl_system);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "validating peer number %u with identity %s\n",
-                  num,
-                  GNUNET_i2s (peer));
-      GNUNET_TRANSPORT_application_validate (ah,
-                                             peer,
-                                             nt,
-                                             addr);
-      GNUNET_free (peer);
-      GNUNET_free (addr);
+      if (NULL != addr)
+      {
+        peer = GNUNET_TESTING_get_pub_key (num, tl_system);
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                    "validating peer number %u with identity %s\n",
+                    num,
+                    GNUNET_i2s (peer));
+        GNUNET_TRANSPORT_application_validate (ah,
+                                               peer,
+                                               nt,
+                                               addr);
+        GNUNET_free (peer);
+        GNUNET_free (addr);
+      }
     }
   }
   cps->con_num = con_num;
@@ -119,14 +122,15 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
   const struct GNUNET_TESTING_Command *cmd;
   struct ConnectPeersState *cps;
   struct GNUNET_PeerIdentity *peer_connection;
-  unsigned int con_num = 0;
   struct GNUNET_TESTING_NodeConnection *pos_connection;
   unsigned int num;
+  unsigned int con_num;
   void *ret = NULL;
 
-  cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                   "connect-peers");
+  cmd = GNUNET_TESTING_interpreter_lookup_command_all (is,
+                                                       "connect-peers");
   cps = cmd->cls;
+  con_num = cps->con_num;
   for (pos_connection = cps->node_connections_head; NULL != pos_connection;
        pos_connection = pos_connection->next)
   {
@@ -134,12 +138,14 @@ notify_connect (struct GNUNET_TESTING_Interpreter *is,
     peer_connection = GNUNET_TESTING_get_pub_key (num, cps->tl_system);
     if (0 == GNUNET_memcmp (peer,
                             peer_connection))
-      con_num++;
+      cps->con_num_notified++;
     GNUNET_free (peer_connection);
   }
-
-
   if (cps->con_num == con_num)
+    cps->additional_connects_notified++;
+
+  if (cps->con_num + cps->additional_connects == cps->con_num_notified
+      + cps->additional_connects_notified)
   {
     GNUNET_TESTING_async_finish (&cps->ac);
   }
@@ -205,13 +211,25 @@ GNUNET_TRANSPORT_get_trait_connect_peer_state (
 }
 
 
+/**
+ * Create command
+ *
+ * @param label name for command
+ * @param start_peer_label Label of the cmd to start a peer.
+ * @param create_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.
+ * @param additional_connects Number of additional connects this cmd will wait for not triggered by this cmd.
+ * @return command.
+ */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
                                     const char *start_peer_label,
                                     const char *create_label,
                                     uint32_t num,
                                     struct GNUNET_TESTING_NetjailTopology *
-                                    topology)
+                                    topology,
+                                    unsigned int additional_connects)
 {
   struct ConnectPeersState *cps;
 
@@ -221,6 +239,7 @@ GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
   cps->create_label = create_label;
   cps->topology = topology;
   cps->notify_connect = notify_connect;
+  cps->additional_connects = additional_connects;
 
   {
     struct GNUNET_TESTING_Command cmd = {