- use HELLOs from DHT to try_connect on TRANSPORT level

3 files changed, 35 insertions, 13 deletions

diff --git a/src/mesh/gnunet-service-mesh_dht.c b/src/mesh/gnunet-service-mesh_dht.c
index 40aceab3f..a88700cf1 100644
--- a/src/mesh/gnunet-service-mesh_dht.c
+++ b/src/mesh/gnunet-service-mesh_dht.c
@@ -222,16 +222,17 @@ dht_get_id_handler (void *cls, struct GNUNET_TIME_Absolute exp,
   struct GMD_search_handle *h = cls;
   struct GNUNET_HELLO_Message *hello;
   struct MeshPeerPath *p;
+  struct MeshPeer *peer;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got results!\n");
   p = path_build_from_dht (get_path, get_path_length,
                            put_path, put_path_length);
+  peer = GMP_get_short (p->peers[p->length - 1]);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got HELLO for %s\n", GMP_2s (peer));
   h->callback (h->cls, p);
   path_destroy (p);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got type %u!\n", type);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Got size %u!\n", size);
   hello = (struct GNUNET_HELLO_Message *) data;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "HELLO size %u!\n", GNUNET_HELLO_size (hello));
+  GMP_set_hello (peer, hello);
+  GMP_try_connect (peer);
   return;
 }
 
diff --git a/src/mesh/gnunet-service-mesh_peer.c b/src/mesh/gnunet-service-mesh_peer.c
index d84d5e6de..d6998c25d 100644
--- a/src/mesh/gnunet-service-mesh_peer.c
+++ b/src/mesh/gnunet-service-mesh_peer.c
@@ -1407,20 +1407,12 @@ GMP_connect (struct MeshPeer *peer)
   struct MeshTunnel3 *t;
   struct MeshPeerPath *p;
   struct MeshConnection *c;
-  struct GNUNET_HELLO_Message *hello;
   int rerun_search;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "peer_connect towards %s\n", GMP_2s (peer));
 
   /* If we have a current hello, try to connect using it. */
-  hello = GMP_get_hello (peer);
-  if (NULL != hello)
-  {
-    struct GNUNET_MessageHeader *mh;
-
-    mh = GNUNET_HELLO_get_header (hello);
-    GNUNET_TRANSPORT_offer_hello (transport_handle, mh, try_connect, peer);
-  }
+  GMP_try_connect (peer);
 
   t = peer->tunnel;
   c = NULL;
@@ -1942,6 +1934,26 @@ GMP_get_hello (struct MeshPeer *peer)
 
 
 /**
+ * Try to connect to a peer on TRANSPORT level.
+ *
+ * @param peer Peer to whom to connect.
+ */
+void
+GMP_try_connect (struct MeshPeer *peer)
+{
+  struct GNUNET_HELLO_Message *hello;
+  struct GNUNET_MessageHeader *mh;
+
+  hello = GMP_get_hello (peer);
+  if (NULL == hello)
+    return;
+
+  mh = GNUNET_HELLO_get_header (hello);
+  GNUNET_TRANSPORT_offer_hello (transport_handle, mh, try_connect, peer);
+}
+
+
+/**
  * Count the number of known paths toward the peer.
  *
  * @param peer Peer to get path info.
diff --git a/src/mesh/gnunet-service-mesh_peer.h b/src/mesh/gnunet-service-mesh_peer.h
index 234991ade..eb6814894 100644
--- a/src/mesh/gnunet-service-mesh_peer.h
+++ b/src/mesh/gnunet-service-mesh_peer.h
@@ -337,6 +337,15 @@ GMP_set_hello (struct MeshPeer *peer, const struct GNUNET_HELLO_Message *hello);
 struct GNUNET_HELLO_Message *
 GMP_get_hello (struct MeshPeer *peer);
 
+
+/**
+ * Try to connect to a peer on TRANSPORT level.
+ *
+ * @param peer Peer to whom to connect.
+ */
+void
+GMP_try_connect (struct MeshPeer *peer);
+
 /**
  * Count the number of known paths toward the peer.
  *