1 files changed, 46 insertions, 37 deletions

diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index d553a3961..eaa8a5f15 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -328,6 +328,8 @@ notify_disconnect (void *cls,
   }
 }
 
+static void
+retrieve_hello (void *cls);
 
 static void
 hello_iter_cb (void *cb_cls,
@@ -338,14 +340,15 @@ hello_iter_cb (void *cb_cls,
   if ((NULL == record) && (NULL == emsg))
   {
     p->pic = NULL;
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Iteration End\n");
+    if (NULL != p->start_cb)
+      p->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, p);
     return;
   }
-  //Check record type et al?
+  // Check record type et al?
   p->hello_size = record->value_size;
   p->hello = GNUNET_malloc (p->hello_size);
   memcpy (p->hello, record->value, p->hello_size);
-  p->hello[p->hello_size-1] = '\0';
+  p->hello[p->hello_size - 1] = '\0';
 
   GNUNET_PEERSTORE_iterate_cancel (p->pic);
   p->pic = NULL;
@@ -360,13 +363,12 @@ hello_iter_cb (void *cb_cls,
   }
 }
 
+
 static void
-retrieve_hello(void *cls)
+retrieve_hello (void *cls)
 {
   struct GNUNET_TRANSPORT_TESTING_PeerContext *p = cls;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Getting hello...\n");
-
+  p->rh_task = NULL;
   p->pic = GNUNET_PEERSTORE_iterate (p->ph,
                                      "transport",
                                      &p->id,
@@ -377,7 +379,6 @@ retrieve_hello(void *cls)
 }
 
 
-
 /**
  * Start a peer with the given configuration
  * @param tth the testing handle
@@ -535,11 +536,8 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct
   // FIXME Error handling
   p->ah = GNUNET_TRANSPORT_application_init (p->cfg);
   GNUNET_assert (NULL != p->ah);
-  // FIXME Error handleing
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10),
-                                retrieve_hello,
-                                p);
-  //GNUNET_assert (NULL != p->pic);
+  // FIXME Error handling
+  p->rh_task = GNUNET_SCHEDULER_add_now (retrieve_hello, p);
 
   return p;
 }
@@ -650,6 +648,11 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
   struct GNUNET_TRANSPORT_TESTING_Handle *tth = p->tth;
   struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc;
   struct GNUNET_TRANSPORT_TESTING_ConnectRequest *ccn;
+  /* shutdown */
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Stopping peer %u (`%s')\n",
+       p->no,
+       GNUNET_i2s (&p->id));
 
   for (cc = tth->cc_head; NULL != cc; cc = ccn)
   {
@@ -660,7 +663,7 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
   }
   if (NULL != p->pic)
   {
-    //GNUNET_PEERSTORE_iterate_cancel (p->pic);
+    GNUNET_PEERSTORE_iterate_cancel (p->pic);
     p->pic = NULL;
   }
   if (NULL != p->th)
@@ -668,19 +671,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
     GNUNET_TRANSPORT_core_disconnect (p->th);
     p->th = NULL;
   }
-  if (NULL != p->peer)
-  {
-    if (GNUNET_OK !=
-        GNUNET_TESTING_peer_stop (p->peer))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Testing lib failed to stop peer %u (`%s')\n",
-           p->no,
-           GNUNET_i2s (&p->id));
-    }
-    GNUNET_TESTING_peer_destroy (p->peer);
-    p->peer = NULL;
-  }
   if (NULL != p->ats)
   {
     GNUNET_ATS_connectivity_done (p->ats);
@@ -693,9 +683,25 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
   }
   if (NULL != p->ph)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Disconnecting from PEERSTORE service\n");
     GNUNET_PEERSTORE_disconnect (p->ph, GNUNET_NO);
     p->ph = NULL;
   }
+
+  if (NULL != p->peer)
+  {
+    if (GNUNET_OK !=
+        GNUNET_TESTING_peer_stop (p->peer))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Testing lib failed to stop peer %u (`%s')\n",
+           p->no,
+           GNUNET_i2s (&p->id));
+    }
+    GNUNET_TESTING_peer_destroy (p->peer);
+    p->peer = NULL;
+  }
   if (NULL != p->hello)
   {
     GNUNET_free (p->hello);
@@ -718,6 +724,9 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
        "Peer %u (`%s') stopped\n",
        p->no,
        GNUNET_i2s (&p->id));
+  if (NULL != p->rh_task)
+    GNUNET_SCHEDULER_cancel (p->rh_task);
+  p->rh_task = NULL;
   GNUNET_free (p);
 }
 
@@ -728,16 +737,16 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
  * FIXME maybe schedule the application_validate somehow
  */
 /*
-static void
-hello_offered (void *cls)
-{
-  struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
-
-  cc->oh = NULL;
-  cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                          &offer_hello,
-                                          cc);
-}*/
+   static void
+   hello_offered (void *cls)
+   {
+   struct GNUNET_TRANSPORT_TESTING_ConnectRequest *cc = cls;
+
+   cc->oh = NULL;
+   cc->tct = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+   &offer_hello,
+   cc);
+   }*/
 
 
 /**