hacking overlay connect

4 files changed, 124 insertions, 67 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 29e5270c6..36ef3cae8 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -22,6 +22,7 @@ gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
 gnunet_service_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index a4ff40659..2aa22d213 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -28,6 +28,7 @@
 #include "gnunet_service_lib.h"
 #include "gnunet_server_lib.h"
 #include "gnunet_transport_service.h"
+#include "gnunet_core_service.h"
 #include <zlib.h>
 
 #include "gnunet_testbed_service.h"
@@ -337,7 +338,12 @@ struct OverlayConnectContext
    * Transport handle of peers
    */
   struct GNUNET_TRANSPORT_Handle *peers_transport[2];
-  
+
+  /**
+   * Core handles of peers
+   */
+  struct GNUNET_CORE_Handle *peers_core[2];
+
   /**
    * HELLO of peers
    */
@@ -1537,57 +1543,7 @@ handle_peer_get_config (void *cls,
 }
 
 
-/**
- * Exchanges HELLO of peers among them
- *
- * @param occ the OverlayConnectContext to look into for HELLO messages
- */
-static void
-exchange_hellos (struct OverlayConnectContext *occ)
-{
-  unsigned int peer;
 
-  GNUNET_assert (NULL != occ->peers_hello[0]);
-  GNUNET_assert (NULL != occ->peers_hello[1]);
-  LOG_DEBUG ("Exchanging hellos\n");
-  for (peer = 0; peer < 2; peer++)
-  {
-    GNUNET_TRANSPORT_offer_hello (occ->peers_transport[peer], 
-                                  occ->peers_hello[peer ^ 1],
-                                  NULL, NULL);
-    GNUNET_TRANSPORT_try_connect (occ->peers_transport[peer],
-                                  &occ->peers_identity[peer ^ 1]);
-    GNUNET_free (occ->peers_hello[peer ^ 1]);
-  }
-}
-
-
-/**
- * Function called whenever there is an update to the
- * HELLO of peers in the OverlayConnectClosure
- *
- * @param cls closure
- * @param hello our updated HELLO
- */
-static void 
-hello_update_cb (void *cls, const struct GNUNET_MessageHeader *hello)
-{
-  struct OverlayConnectContextWrapper *occw = cls;
-  struct OverlayConnectContext *occ;
-  unsigned int peer;
-  uint16_t msize;
-    
-  msize = ntohs (hello->size);
-  peer = occw->peer;
-  GNUNET_assert (peer <= 1);
-  occ = occw->occ;
-  occ->peers_hello[peer] = GNUNET_malloc (msize);
-  memcpy (occ->peers_hello[peer], hello, msize);
-  GNUNET_TRANSPORT_get_hello_cancel (occ->peers_ghh[peer]);
-  occ->peers_ghh[peer] = NULL;
-  if (NULL != occ->peers_hello[peer ^ 1])
-    exchange_hellos (occ);
-}
 
 
 /**
@@ -1603,26 +1559,36 @@ static void
 overlay_connect_notify (void *cls,
                         const struct GNUNET_PeerIdentity * new_peer,
                         const struct GNUNET_ATS_Information * ats,
-                        uint32_t ats_count)
+                        unsigned int ats_count)
 {
   struct OverlayConnectContextWrapper *occw = cls;
   struct OverlayConnectContext *occ;
   struct GNUNET_TESTBED_ConnectionEventMessage *msg;
+  char *new_peer_str;
+  char *other_peer_str;
   unsigned int peer;
 
+  LOG_DEBUG ("Overlay connect notify\n");
   peer = occw->peer;
   occ = occw->occ;
+  if (0 == memcmp (new_peer, &occ->peers_identity[peer],
+                   sizeof (struct GNUNET_PeerIdentity)))
+    return;
+  new_peer_str = GNUNET_strdup (GNUNET_i2s (new_peer));
+  other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->peers_identity[peer ^ 1]));
   if (0 != memcmp (new_peer, &occ->peers_identity[peer ^ 1],
                    sizeof (struct GNUNET_PeerIdentity)))
   {
     LOG_DEBUG ("Unexpected peer %4s connected to peer %4s\n",
-               GNUNET_i2s (new_peer), 
-               GNUNET_i2s (&occ->peers_identity[peer ^ 1]));
+               new_peer_str, other_peer_str);
+    GNUNET_free (new_peer_str);
+    GNUNET_free (other_peer_str);
     return;
   }
   GNUNET_free (occw);
-  LOG_DEBUG ("Peer %4s connected to peer %4s\n", GNUNET_i2s (new_peer),
-             GNUNET_i2s (&occ->peers_identity[peer ^ 1]));
+  LOG_DEBUG ("Peer %4s connected to peer %4s\n", new_peer_str, other_peer_str);
+  GNUNET_free (new_peer_str);
+  GNUNET_free (other_peer_str);
   GNUNET_TRANSPORT_disconnect (occ->peers_transport[peer]);
   occ->peers_transport[peer] = NULL;
   if (NULL != occ->peers_transport[peer ^ 1])
@@ -1644,6 +1610,93 @@ overlay_connect_notify (void *cls,
 
 
 /**
+ * For peers that haven't yet connected, send
+ * CORE connect requests.
+ *
+ * @param cls the 'struct SendHelloContext *'
+ * @param tc scheduler context
+ */
+static void
+send_core_connect_requests (void *cls,
+                            const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct OverlayConnectContext *occ = cls;
+  unsigned int peer;
+
+  LOG_DEBUG ("Sending connect requests to transport\n");
+  for (peer = 0; peer < 2; peer++)
+    GNUNET_TRANSPORT_try_connect (occ->peers_transport[peer],
+                                  &occ->peers_identity[peer ^ 1]);
+}
+
+
+/**
+ * Exchanges HELLO of peers among them
+ *
+ * @param occ the OverlayConnectContext to look into for HELLO messages
+ */
+static void
+exchange_hellos (struct OverlayConnectContext *occ)
+{
+  struct GNUNET_CORE_MessageHandler no_handlers[] = {
+    {NULL, 0, 0}
+  };
+  struct OverlayConnectContextWrapper *occw;
+  unsigned int peer;
+
+  GNUNET_assert (NULL != occ->peers_hello[0]);
+  GNUNET_assert (NULL != occ->peers_hello[1]);
+  LOG_DEBUG ("Exchanging hellos\n");
+  for (peer = 0; peer < 2; peer++)
+  {
+    GNUNET_TRANSPORT_offer_hello (occ->peers_transport[peer], 
+                                  occ->peers_hello[peer ^ 1],
+                                  NULL, NULL);
+    GNUNET_free (occ->peers_hello[peer ^ 1]);
+    occ->peers_hello[peer ^ 1] = NULL;
+    occw = GNUNET_malloc (sizeof (struct OverlayConnectContextWrapper));
+    occw->occ = occ;
+    occw->peer = peer;
+    occ->peers_core[peer] = 
+      GNUNET_CORE_connect (occ->peers[peer]->cfg,
+                           occw, NULL, &overlay_connect_notify, NULL,
+                           NULL, GNUNET_NO, NULL, GNUNET_NO, no_handlers);
+  }
+  if ((NULL == occ->peers_hello[peer]) && (NULL == occ->peers_hello[peer ^ 1]))
+    GNUNET_SCHEDULER_add_now (&send_core_connect_requests, occ);
+}
+
+
+/**
+ * Function called whenever there is an update to the
+ * HELLO of peers in the OverlayConnectClosure
+ *
+ * @param cls closure
+ * @param hello our updated HELLO
+ */
+static void 
+hello_update_cb (void *cls, const struct GNUNET_MessageHeader *hello)
+{
+  struct OverlayConnectContextWrapper *occw = cls;
+  struct OverlayConnectContext *occ;
+  unsigned int peer;
+  uint16_t msize;
+    
+  msize = ntohs (hello->size);
+  peer = occw->peer;
+  GNUNET_assert (peer <= 1);
+  occ = occw->occ;
+  GNUNET_free (occw);
+  occ->peers_hello[peer] = GNUNET_malloc (msize);
+  memcpy (occ->peers_hello[peer], hello, msize);
+  GNUNET_TRANSPORT_get_hello_cancel (occ->peers_ghh[peer]);
+  occ->peers_ghh[peer] = NULL;
+  if (NULL != occ->peers_hello[peer ^ 1])
+    exchange_hellos (occ);
+}
+
+
+/**
  * Handler for GNUNET_MESSAGE_TYPE_TESTBED_OLCONNECT messages
  *
  * @param cls NULL
@@ -1678,15 +1731,15 @@ handle_overlay_connect (void *cls,
   occ->op_id = GNUNET_ntohll (msg->operation_id);
   for (peer = 0; peer < 2; peer++)
   {
-    occw = GNUNET_malloc (sizeof (struct OverlayConnectContextWrapper));
-    occw->occ = occ;
-    occw->peer = peer;
     GNUNET_TESTING_peer_get_identity (occ->peers[peer]->peer, 
                                       &occ->peers_identity[peer]);
     occ->peers_transport[peer] = 
       GNUNET_TRANSPORT_connect (occ->peers[peer]->cfg,
-                                &occ->peers_identity[peer], occw, NULL,
-                                &overlay_connect_notify, NULL);
+                                &occ->peers_identity[peer],
+                                NULL, NULL, NULL, NULL);
+    occw = GNUNET_malloc (sizeof (struct OverlayConnectContextWrapper));
+    occw->occ = occ;
+    occw->peer = peer;
     occ->peers_ghh[peer] =
       GNUNET_TRANSPORT_get_hello (occ->peers_transport[peer], 
                                   &hello_update_cb, occw);
@@ -1873,6 +1926,7 @@ testbed_run (void *cls,
  */
 int main (int argc, char *const *argv)
 {
+  //sleep (60);                 /* Debugging */
   return
     (GNUNET_OK ==
      GNUNET_SERVICE_run (argc,
diff --git a/src/testbed/test_testbed_api_2peers.c b/src/testbed/test_testbed_api_2peers.c
index aff71afe0..781194bf4 100644
--- a/src/testbed/test_testbed_api_2peers.c
+++ b/src/testbed/test_testbed_api_2peers.c
@@ -389,7 +389,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   cfg = GNUNET_CONFIGURATION_dup (config);
   cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb, NULL);
   abort_task = GNUNET_SCHEDULER_add_delayed 
-    (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5), &do_abort, NULL);
+    (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 30), &do_abort, NULL);
 }
 
 
@@ -409,7 +409,7 @@ int main (int argc, char **argv)
   };
   result = INIT;
   ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
-                            "test_testbed_api", "nohelp", options, &run,
+                            "test_testbed_api_2peers", "nohelp", options, &run,
                             NULL);
   if ((GNUNET_OK != ret) || (SUCCESS != result))
     return 1;
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index a3e3c30b1..2bd82949e 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -163,7 +163,9 @@ static void
 check_readiness (struct GNUNET_TESTBED_Operation *op)
 {   
   unsigned int i;
-  
+
+  if (GNUNET_SCHEDULER_NO_TASK != op->start_task_id)
+    return;  
   for (i = 0; i < op->nqueues; i++)
   {
     if (0 == op->queues[i]->active)
@@ -173,8 +175,7 @@ check_readiness (struct GNUNET_TESTBED_Operation *op)
   {
     op->queues[i]->active--;
   }
-  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == op->start_task_id);
-  op->start_task_id = GNUNET_SCHEDULER_add_now (&call_start, op);  
+  op->start_task_id = GNUNET_SCHEDULER_add_now (&call_start, op);
 }
 
 
@@ -197,7 +198,8 @@ GNUNET_TESTBED_operation_create_ (void *cls,
   op->start = start;
   op->release = release;
   op->cb_cls = cls;
-  return op;  
+  op->start_task_id = GNUNET_SCHEDULER_NO_TASK;
+  return op;
 }