1 files changed, 47 insertions, 54 deletions

diff --git a/src/transport/transport_api_cmd_start_peer.c b/src/transport/transport_api_cmd_start_peer.c
index f4e92944b..dc19f10eb 100644
--- a/src/transport/transport_api_cmd_start_peer.c
+++ b/src/transport/transport_api_cmd_start_peer.c
@@ -65,7 +65,7 @@ hello_iter_cb (void *cb_cls,
 
   GNUNET_PEERSTORE_iterate_cancel (sps->pic);
   sps->pic = NULL;
-  sps->finished = GNUNET_YES;
+  GNUNET_TESTING_async_finish (&sps->ac);
 }
 
 
@@ -90,26 +90,6 @@ retrieve_hello (void *cls)
 
 
 /**
- * This function checks StartPeerState#finished, which is set when the hello was retrieved.
- *
- */
-static int
-start_peer_finish (void *cls,
-                   GNUNET_SCHEDULER_TaskCallback cont,
-                   void *cont_cls)
-{
-  struct StartPeerState *sps = cls;
-
-  if (GNUNET_YES == sps->finished)
-  {
-    cont (cont_cls);
-  }
-
-  return sps->finished;
-}
-
-
-/**
  * Disconnect callback for the connection to the core service.
  *
  */
@@ -141,7 +121,7 @@ notify_connect (void *cls,
   struct StartPeerState *sps = cls;
   struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
   struct GNUNET_HashCode hc;
-  int node_number;
+  struct GNUNET_CRYPTO_EddsaPublicKey public_key = peer->public_key;
 
   void *ret = NULL;
 
@@ -152,9 +132,7 @@ notify_connect (void *cls,
        sps->no,
        GNUNET_i2s (&sps->id));
 
-  // TODO we need to store with a key identifying the netns node in the future. For now we have only one connecting node.
-  node_number = 1;
-  GNUNET_CRYPTO_hash (&node_number, sizeof(node_number), &hc);
+  GNUNET_CRYPTO_hash (&public_key, sizeof(public_key), &hc);
 
 
   memcpy (key,
@@ -166,6 +144,11 @@ notify_connect (void *cls,
                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
 
   GNUNET_free (key);
+
+  sps->notify_connect (cls,
+                       peer,
+                       mq);
+
   // TODO what does the handler function need?
   return ret;
 }
@@ -177,7 +160,6 @@ notify_connect (void *cls,
  */
 static void
 start_peer_run (void *cls,
-                const struct GNUNET_TESTING_Command *cmd,
                 struct GNUNET_TESTING_Interpreter *is)
 {
   struct StartPeerState *sps = cls;
@@ -187,7 +169,8 @@ start_peer_run (void *cls,
   struct GNUNET_TESTING_System *tl_system;
   char *home;
   char *transport_unix_path;
-  char *communicator_unix_path;
+  char *tcp_communicator_unix_path;
+  char *udp_communicator_unix_path;
   char *bindto;
 
   if (GNUNET_NO == GNUNET_DISK_file_test (sps->cfgname))
@@ -195,7 +178,7 @@ start_peer_run (void *cls,
     LOG (GNUNET_ERROR_TYPE_ERROR,
          "File not found: `%s'\n",
          sps->cfgname);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -212,7 +195,11 @@ start_peer_run (void *cls,
                    "$GNUNET_RUNTIME_DIR/tng-p%u.sock",
                    sps->no);
 
-  GNUNET_asprintf (&communicator_unix_path,
+  GNUNET_asprintf (&tcp_communicator_unix_path,
+                   "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
+                   sps->no);
+
+  GNUNET_asprintf (&udp_communicator_unix_path,
                    "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
                    sps->no);
 
@@ -220,6 +207,9 @@ start_peer_run (void *cls,
                    "%s:60002",
                    sps->node_ip);
 
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "node_ip %s\n",
+       bindto);
 
   GNUNET_CONFIGURATION_set_value_string (sps->cfg, "PATHS", "GNUNET_TEST_HOME",
                                          home);
@@ -228,11 +218,18 @@ start_peer_run (void *cls,
   GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
                                          "BINDTO",
                                          bindto);
+  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
+                                         "BINDTO",
+                                         bindto);
   GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
                                          "UNIXPATH",
-                                         communicator_unix_path);
+                                         tcp_communicator_unix_path);
+  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
+                                         "UNIXPATH",
+                                         udp_communicator_unix_path);
 
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (sps->system_label);
+  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                          sps->system_label);
   GNUNET_TESTING_get_trait_test_system (system_cmd,
                                         &tl_system);
 
@@ -246,7 +243,7 @@ start_peer_run (void *cls,
          "Testing library failed to create unique configuration based on `%s'\n",
          sps->cfgname);
     GNUNET_CONFIGURATION_destroy (sps->cfg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -262,7 +259,7 @@ start_peer_run (void *cls,
          sps->cfgname,
          emsg);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -272,7 +269,7 @@ start_peer_run (void *cls,
          "Testing library failed to create unique configuration based on `%s'\n",
          sps->cfgname);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -291,7 +288,7 @@ start_peer_run (void *cls,
          "Testing library failed to obtain peer identity for peer %u\n",
          sps->no);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -312,7 +309,7 @@ start_peer_run (void *cls,
          sps->cfgname,
          emsg);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -324,7 +321,7 @@ start_peer_run (void *cls,
          sps->cfgname,
          emsg);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
 
@@ -336,7 +333,7 @@ start_peer_run (void *cls,
          sps->cfgname,
          emsg);
     GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail ();
+    GNUNET_TESTING_interpreter_fail (is);
     return;
   }
   sps->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, sps);
@@ -348,8 +345,7 @@ start_peer_run (void *cls,
  *
  */
 static void
-start_peer_cleanup (void *cls,
-                    const struct GNUNET_TESTING_Command *cmd)
+start_peer_cleanup (void *cls)
 {
   struct StartPeerState *sps = cls;
 
@@ -437,10 +433,9 @@ start_peer_traits (void *cls,
  *
  */
 int
-GNUNET_TRANSPORT_get_trait_state (const struct
-                                  GNUNET_TESTING_Command
-                                  *cmd,
-                                  struct StartPeerState **sps)
+GNUNET_TRANSPORT_get_trait_state (
+  const struct GNUNET_TESTING_Command *cmd,
+  struct StartPeerState **sps)
 {
   return cmd->traits (cmd->cls,
                       (const void **) sps,
@@ -501,7 +496,8 @@ GNUNET_TRANSPORT_get_trait_connected_peers_map (const struct
                                                 GNUNET_TESTING_Command
                                                 *cmd,
                                                 struct
-                                                GNUNET_CONTAINER_MultiShortmap *
+                                                GNUNET_CONTAINER_MultiShortmap
+                                                *
                                                 *
                                                 connected_peers_map)
 {
@@ -565,12 +561,11 @@ GNUNET_TRANSPORT_get_trait_peer_id (const struct
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_start_peer (const char *label,
                                  const char *system_label,
-                                 char *m,
-                                 char *n,
-                                 char *local_m,
+                                 uint32_t no,
                                  char *node_ip,
                                  struct GNUNET_MQ_MessageHandler *handlers,
-                                 const char *cfgname)
+                                 const char *cfgname,
+                                 GNUNET_TRANSPORT_NotifyConnect notify_connect)
 {
   struct StartPeerState *sps;
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
@@ -578,14 +573,12 @@ GNUNET_TRANSPORT_cmd_start_peer (const char *label,
   unsigned int i;
 
   sps = GNUNET_new (struct StartPeerState);
-  sps->m = m;
-  sps->n = n;
-  sps->local_m = local_m;
-  sps->no = (atoi (n) - 1) * atoi (sps->local_m) + atoi (m);
+  sps->no = no;
   sps->system_label = system_label;
   sps->connected_peers_map = connected_peers_map;
   sps->cfgname = cfgname;
   sps->node_ip = node_ip;
+  sps->notify_connect = notify_connect;
 
   if (NULL != handlers)
   {
@@ -602,7 +595,7 @@ GNUNET_TRANSPORT_cmd_start_peer (const char *label,
     .cls = sps,
     .label = label,
     .run = &start_peer_run,
-    .finish = &start_peer_finish,
+    .ac = &sps->ac,
     .cleanup = &start_peer_cleanup,
     .traits = &start_peer_traits
   };