1 files changed, 55 insertions, 20 deletions

diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index d9253b6d4..f4b2e935f 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -29,6 +29,7 @@
 #include "gnunet_transport_application_service.h"
 #include "gnunet_hello_lib.h"
 #include "gnunet_transport_service.h"
+#include "transport-testing-cmds.h"
 
 /**
  * Generic logging shortcut
@@ -40,6 +41,8 @@ struct ConnectPeersState
   const char *peer1_label;
 
   const char *peer2_label;
+
+  struct GNUNET_PeerIdentity *id;
 };
 
 
@@ -52,12 +55,13 @@ connect_peers_run (void *cls,
   const struct GNUNET_TESTING_Command *peer1_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;
   char *hello;
   size_t *hello_size;
   enum GNUNET_NetworkType nt = 0;
+  char *peer_id;
 
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer1_label);
   GNUNET_TRANSPORT_get_trait_application_handle (peer1_cmd,
@@ -70,6 +74,31 @@ connect_peers_run (void *cls,
        "hello: %s\n",
        hello);
 
+  /*GNUNET_TRANSPORT_get_trait_peer_id (peer1_cmd,
+                                    &id);
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "pid %s\n",
+       GNUNET_i2s_full(id));*/
+
+  if(strstr(hello, "60002") != NULL)
+    {
+    addr = "tcp-192.168.15.2:60003";
+    peer_id = "4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730";
+    }
+  else
+    {
+    addr = "tcp-192.168.15.1:60002";
+    peer_id = "F2F3X9G1YNCTXKK7A4J6M4ZM4BBSKC9DEXZVHCWQ475M0C7PNWCG";
+    }
+
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "get pub key\n");
+  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.
   // ---------------------------------------------
   /*peer2_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer2_label);
@@ -84,14 +113,16 @@ connect_peers_run (void *cls,
                                        *hello_size,
                                        id,
                                        &nt,
-                                       &t);
+                                       &t);*/
 
   //----------------------------------------------
 
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "application validate\n");
   GNUNET_TRANSPORT_application_validate (ah,
-                                         id,
+                                         peer,
                                          nt,
-                                         addr);*/
+                                         addr);
 }
 
 
@@ -100,34 +131,38 @@ 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);
-
-  peer2_cmd = GNUNET_TESTING_interpreter_lookup_command (cps->peer2_label);
-  GNUNET_TRANSPORT_get_trait_connected_peers_map (peer2_cmd,
+  GNUNET_TRANSPORT_get_trait_connected_peers_map (peer1_cmd,
                                                 &connected_peers_map);
 
-  ret = GNUNET_CONTAINER_multipeermap_contains (connected_peers_map,
-                                                id);
+  node_number = 1;
+    GNUNET_CRYPTO_hash (&node_number, sizeof(node_number), &hc);
+    
+  // 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;*/
-  cont (cont_cls);
     LOG (GNUNET_ERROR_TYPE_ERROR,
        "connect peer finish\n");
-  return GNUNET_OK;
+  }
+
+  return ret;
+  /*cont (cont_cls);
+    return GNUNET_OK;*/
 }