1 files changed, 85 insertions, 33 deletions

diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 0f2154c46..34b3d5925 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -29,20 +29,37 @@
 #include "gnunet_transport_application_service.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_transport_service.h"
+#include "transport-testing-cmds.h"
 
 /**
  * Generic logging shortcut
  */
 #define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
 
+/**
+ * Struct to store information needed in callbacks.
+ *
+ */
 struct ConnectPeersState
 {
-  const char *peer1_label;
-
-  const char *peer2_label;
+  /**
+   * Label of the cmd to start a peer.
+   *
+   */
+  const char *start_peer_label;
+
+  /**
+   * The peer identity of this peer.
+   *
+   */
+  struct GNUNET_PeerIdentity *id;
 };
 
 
+/**
+ * The run method of this cmd will connect to peers.
+ *
+ */
 static void
 connect_peers_run (void *cls,
                    const struct GNUNET_TESTING_Command *cmd,
@@ -50,25 +67,43 @@ connect_peers_run (void *cls,
 {
   struct ConnectPeersState *cps = cls;
   const struct GNUNET_TESTING_Command *peer1_cmd;
-  const struct GNUNET_TESTING_Command *peer2_cmd;
+  // const struct GNUNET_TESTING_Command *peer2_cmd;
   struct GNUNET_TRANSPORT_ApplicationHandle *ah;
-  struct GNUNET_PeerIdentity *id;
+  struct GNUNET_PeerIdentity *peer = GNUNET_new (struct GNUNET_PeerIdentity);
   char *addr;
-  struct GNUNET_TIME_Absolute t;
+  // struct GNUNET_TIME_Absolute t;
   char *hello;
-  size_t *hello_size;
+  // size_t *hello_size;
   enum GNUNET_NetworkType nt = 0;
+  char *peer_id;
+  struct GNUNET_PeerIdentity *id;
 
-  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer1_label);
+  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label);
   GNUNET_TRANSPORT_get_trait_application_handle (peer1_cmd,
                                                  &ah);
 
   GNUNET_TRANSPORT_get_trait_hello (peer1_cmd,
                                     &hello);
 
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "hello: %s\n",
-       hello);
+  GNUNET_TRANSPORT_get_trait_peer_id (peer1_cmd,
+                                      &id);
+
+  if (strstr (hello, "60002") != NULL)
+  {
+    addr = "tcp-192.168.15.2:60003";
+    peer_id = "F2F3X9G1YNCTXKK7A4J6M4ZM4BBSKC9DEXZVHCWQ475M0C7PNWCG";
+  }
+  else
+  {
+    addr = "tcp-192.168.15.1:60002";
+    peer_id = "4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730";
+  }
+
+  GNUNET_CRYPTO_eddsa_public_key_from_string (peer_id,
+                                              strlen (peer_id),
+                                              &peer->public_key);
+
+  cps->id = peer;
 
   // TODO This does not work, because the other peer is running in another local loop. We need to message between different local loops. For now we will create the hello manually with the known information about the other local peers.
   // ---------------------------------------------
@@ -84,50 +119,63 @@ connect_peers_run (void *cls,
                                        *hello_size,
                                        id,
                                        &nt,
-                                       &t);
+                                       &t);*/
+
+  // ----------------------------------------------
 
-  //----------------------------------------------
 
   GNUNET_TRANSPORT_application_validate (ah,
-                                         id,
+                                         peer,
                                          nt,
-                                         addr);*/
+                                         addr);
 }
 
 
+/**
+ * The finish function of this cmd will check if the peer we are trying to connect to is in the connected peers map of the start peer cmd for this peer.
+ *
+ */
 static int
 connect_peers_finish (void *cls,
                       GNUNET_SCHEDULER_TaskCallback cont,
                       void *cont_cls)
 {
-  /*struct ConnectPeersState *cps = cls;
+  struct ConnectPeersState *cps = cls;
   const struct GNUNET_TESTING_Command *peer1_cmd;
-  const struct GNUNET_TESTING_Command *peer2_cmd;
-  struct GNUNET_CONTAINER_MultiPeerMap *connected_peers_map;
+  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
   unsigned int ret;
-  struct GNUNET_PeerIdentity *id;
+  struct GNUNET_ShortHashCode *key = GNUNET_new (struct GNUNET_ShortHashCode);
+  struct GNUNET_HashCode hc;
+  int node_number;
 
-  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer1_label);
-  GNUNET_TRANSPORT_get_trait_peer_id (peer1_cmd,
-                                    &id);
+  peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->start_peer_label);
+  GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd,
+                                                  &connected_peers_map);
 
-  peer2_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer2_label);
-  GNUNET_TRANSPORT_get_trait_connected_peers_map (peer2_cmd,
-                                                &connected_peers_map);
+  node_number = 1;
+  GNUNET_CRYPTO_hash (&node_number, sizeof(node_number), &hc);
 
-  ret = GNUNET_CONTAINER_multipeermap_contains (connected_peers_map,
-                                                id);
+  // TODO we need to store with a key identifying the netns node in the future. For now we have only one connecting node.
+  memcpy (key,
+          &hc,
+          sizeof (*key));
+  ret = GNUNET_CONTAINER_multishortmap_contains (connected_peers_map,
+                                                 key);
 
   if (GNUNET_YES == ret)
   {
     cont (cont_cls);
   }
 
-  return ret;*/
-  return GNUNET_OK;
+  GNUNET_free (key);
+  return ret;
 }
 
 
+/**
+ * Trait function of this cmd does nothing.
+ *
+ */
 static int
 connect_peers_traits (void *cls,
                       const void **ret,
@@ -138,12 +186,17 @@ connect_peers_traits (void *cls,
 }
 
 
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
 static void
 connect_peers_cleanup (void *cls,
                        const struct GNUNET_TESTING_Command *cmd)
 {
   struct ConnectPeersState *cps = cls;
 
+  GNUNET_free (cps->id);
   GNUNET_free (cps);
 }
 
@@ -152,18 +205,17 @@ connect_peers_cleanup (void *cls,
  * Create command.
  *
  * @param label name for command.
+ * @param start_peer_label Label of the cmd to start a peer.
  * @return command.
  */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
-                                    const char *peer1_label,
-                                    const char *peer2_label)
+                                    const char *start_peer_label)
 {
   struct ConnectPeersState *cps;
 
   cps = GNUNET_new (struct ConnectPeersState);
-  cps->peer1_label = peer1_label;
-  cps->peer2_label = peer2_label;
+  cps->start_peer_label = start_peer_label;
 
 
   struct GNUNET_TESTING_Command cmd = {