X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftransport%2Ftransport-testing.c;h=32331d9d9fce4d1373acd06c91eb0eb4b84a5f0b;hb=66963559294951161370c50f2430a31d54448f86;hp=036fff9e46280048960657da90ae6ecc04f41b52;hpb=0663a057d7611270d5f41ae8b345125d737387f2;p=oweals%2Fgnunet.git

diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 036fff9e4..32331d9d9 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -27,30 +27,13 @@
 
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_EXTRA_LOGGING
 
-struct PeerContext *
-find_peer_context_by_pc ( struct TransportTestingHandle *tth,
-                          struct PeerContext *p)
-{
-  struct PeerContext * t = tth->p_head;
-
-  while (t != NULL)
-  {
-    if (p == t)
-      break;
-    t = t->next;
-  }
-
-  return t;
-}
-
-
-struct PeerContext *
-find_peer_context ( struct TransportTestingHandle *tth,
-                    const struct GNUNET_PeerIdentity *peer)
+static struct PeerContext *
+find_peer_context (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+                   const struct GNUNET_PeerIdentity *peer)
 {
-  struct PeerContext * t = tth->p_head;
+  GNUNET_assert (tth != NULL);
+  struct PeerContext *t = tth->p_head;
 
   while (t != NULL)
   {
@@ -62,17 +45,18 @@ find_peer_context ( struct TransportTestingHandle *tth,
   return t;
 }
 
-struct ConnectingContext *
-find_connecting_context ( struct TransportTestingHandle *tth,
-                          struct PeerContext *p1,
-                          struct PeerContext * p2)
+
+static struct ConnectingContext *
+find_connecting_context (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+                         struct PeerContext *p1, struct PeerContext *p2)
 {
-  struct ConnectingContext * cc = tth->cc_head;
+  GNUNET_assert (tth != NULL);
+  struct ConnectingContext *cc = tth->cc_head;
 
   while (cc != NULL)
   {
     if ((cc->p1 == p1) && (cc->p2 == p2))
-        break;
+      break;
     if ((cc->p1 == p2) && (cc->p2 == p1))
       break;
     cc = cc->next;
@@ -81,36 +65,33 @@ find_connecting_context ( struct TransportTestingHandle *tth,
   return cc;
 }
 
+
 static void
 notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                uint32_t ats_count)
+                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   struct PeerContext *p = cls;
-  /* Find PeerContext */
-  struct PeerContext * p2 = find_peer_context (p->tth, peer);
+  char *p2_s;
+  struct PeerContext *p2;
 
-  if (p == NULL)
-    return;
+  GNUNET_assert (NULL != p);
+  GNUNET_assert (NULL != p->tth);
+  p2 = find_peer_context (p->tth, peer);
   if (p->nc != NULL)
     p->nc (p->cb_cls, peer, ats, ats_count);
 
-#if VERBOSE
-  char * p2_s;
   if (p2 != NULL)
-    GNUNET_asprintf(&p2_s, "%u (`%s')", p2->no, GNUNET_i2s (&p2->id));
+    GNUNET_asprintf (&p2_s, "%u (`%s')", p2->no, GNUNET_i2s (&p2->id));
   else
-    GNUNET_asprintf(&p2_s, "`%s'", GNUNET_i2s (peer));
+    GNUNET_asprintf (&p2_s, "`%s'", GNUNET_i2s (peer));
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
-      "Peers %s connected to peer %u (`%s')\n",
-      p2_s,
-      p->no, GNUNET_i2s (&p->id));
+                   "Peers %s connected to peer %u (`%s')\n", p2_s, p->no,
+                   GNUNET_i2s (&p->id));
   GNUNET_free (p2_s);
-#endif
-
 
   /* Find ConnectingContext */
-  struct ConnectingContext * cc = find_connecting_context(p->tth, p, p2);
+  struct ConnectingContext *cc = find_connecting_context (p->tth, p, p2);
+
   if (cc == NULL)
     return;
 
@@ -118,31 +99,41 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
     cc->p1_c = GNUNET_YES;
 
   if (p == cc->p2)
-      cc->p2_c = GNUNET_YES;
+    cc->p2_c = GNUNET_YES;
 
   if ((cc->p1_c == GNUNET_YES) && (cc->p2_c == GNUNET_YES))
   {
     cc->cb (cc->p1, cc->p2, cc->cb_cls);
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(p->tth, cc);
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (p->tth, cc);
   }
 }
 
+
 static void
 notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *p = cls;
+
   /* Find PeerContext */
-  struct PeerContext * p2 = find_peer_context (p->tth, peer);
+  int no = 0;
+  struct PeerContext *p2 = NULL;
+
+  if (p != NULL)
+  {
+    GNUNET_assert (p->tth != NULL);
+    p2 = find_peer_context (p->tth, peer);
+    no = p->no;
+  }
+
+  char *p2_s;
 
-  char * p2_s;
   if (p2 != NULL)
-    GNUNET_asprintf(&p2_s, "%u (`%s')", p2->no, GNUNET_i2s (&p2->id));
+    GNUNET_asprintf (&p2_s, "%u (`%s')", p2->no, GNUNET_i2s (&p2->id));
   else
-    GNUNET_asprintf(&p2_s, "`%s'", GNUNET_i2s (peer));
+    GNUNET_asprintf (&p2_s, "`%s'", GNUNET_i2s (peer));
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
-      "Peers %s disconnected from peer %u (`%s')\n",
-      p2_s,
-      p->no, GNUNET_i2s (&p->id));
+                   "Peers %s disconnected from peer %u (`%s')\n", p2_s, no,
+                   GNUNET_i2s (&p->id));
   GNUNET_free (p2_s);
 
   if (p == NULL)
@@ -151,11 +142,11 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
     p->nd (p->cb_cls, peer);
 }
 
+
 static void
 notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
                 const struct GNUNET_MessageHeader *message,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                uint32_t ats_count)
+                const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
 {
   struct PeerContext *p = cls;
 
@@ -165,33 +156,27 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
     p->rec (p->cb_cls, peer, message, ats, ats_count);
 }
 
+
 static void
 get_hello (void *cb_cls, const struct GNUNET_MessageHeader *message)
 {
   struct PeerContext *p = cb_cls;
+  struct GNUNET_PeerIdentity hello_id;
 
   GNUNET_assert (message != NULL);
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *)
-                                      message, &p->id));
+                                      message, &hello_id));
+  GNUNET_assert (0 == memcmp (&hello_id, &p->id, sizeof (hello_id)));
+  GNUNET_free_non_null (p->hello);
+  p->hello = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (message);
 
-  if (p->hello != NULL)
-    GNUNET_free (p->hello);
-
-  size_t size = GNUNET_HELLO_size((const struct GNUNET_HELLO_Message *) message);
-  p->hello = GNUNET_malloc (size);
-  memcpy (p->hello,
-        (const struct GNUNET_HELLO_Message *) message,
-        size);
-
-  if (p->start_cb != NULL)
+  if (NULL != p->start_cb)
   {
-#if VERBOSE
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
-        "Peer %u (`%s') successfully started\n",
-        p->no, GNUNET_i2s (&p->id), size);
-#endif
-    p->start_cb(p, p->cb_cls);
+                     "Peer %u (`%s') successfully started\n", p->no,
+                     GNUNET_i2s (&p->id));
+    p->start_cb (p, p->cb_cls);
     p->start_cb = NULL;
   }
 }
@@ -208,15 +193,22 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0)
     return;
 
-  char * p2_s = strdup(GNUNET_i2s (&p2->id));
+  GNUNET_assert (cc != NULL);
+  GNUNET_assert (cc->p1 != NULL);
+  GNUNET_assert (cc->p2 != NULL);
+
+  char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id));
+
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
-      "Asking peers %u (`%s') to connect peer %u (`%s')\n",
-      p1->no, GNUNET_i2s (&p1->id), p2->no, p2_s);
+                   "Asking peer %u (`%s') to connect peer %u (`%s'), providing HELLO with %u bytes\n",
+                   p1->no, GNUNET_i2s (&p1->id), p2->no, p2_s,
+                   GNUNET_HELLO_size (cc->p2->hello));
   GNUNET_free (p2_s);
 
   GNUNET_TRANSPORT_offer_hello (cc->th_p1,
-      (const struct GNUNET_MessageHeader *) cc->p2->hello, NULL, NULL);
-  GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id);
+                                (const struct GNUNET_MessageHeader *) cc->
+                                p2->hello, NULL, NULL);
+  GNUNET_TRANSPORT_try_connect (cc->th_p1, &p2->id, NULL, NULL); /*FIXME TRY_CONNECT change */
 
   cc->tct =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &try_connect, cc);
@@ -225,50 +217,94 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 /**
  * Start a peer with the given configuration
+ * @param tth the testing handle
+ * @param cfgname configuration file
+ * @param peer_id a unique number to identify the peer
  * @param rec receive callback
  * @param nc connect callback
  * @param nd disconnect callback
+ * @param start_cb start callback
  * @param cb_cls closure for callback
  * @return the peer context
  */
 struct PeerContext *
-GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
-                                     const char *cfgname,
-                                     int peer_id,
+GNUNET_TRANSPORT_TESTING_start_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
+                                     const char *cfgname, int peer_id,
                                      GNUNET_TRANSPORT_ReceiveCallback rec,
                                      GNUNET_TRANSPORT_NotifyConnect nc,
                                      GNUNET_TRANSPORT_NotifyDisconnect nd,
                                      GNUNET_TRANSPORT_TESTING_start_cb start_cb,
                                      void *cb_cls)
 {
+  char *emsg = NULL;
+  struct GNUNET_PeerIdentity *dummy;
+
+  GNUNET_assert (NULL != tth);
+  GNUNET_assert (NULL != tth->tl_system);
+
   if (GNUNET_DISK_file_test (cfgname) == GNUNET_NO)
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
-        "File not found: `%s' \n", cfgname);
+                     "File not found: `%s' \n", cfgname);
     return NULL;
   }
 
   struct PeerContext *p = GNUNET_malloc (sizeof (struct PeerContext));
+  GNUNET_CONTAINER_DLL_insert (tth->p_head, tth->p_tail, p);
 
+  /* Create configuration and call testing lib to modify it */
   p->cfg = GNUNET_CONFIGURATION_create ();
-
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  if (GNUNET_CONFIGURATION_have_value (p->cfg, "PATHS", "SERVICEHOME"))
-    GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME",
-                                           &p->servicehome);
-  if (NULL != p->servicehome)
-    GNUNET_DISK_directory_remove (p->servicehome);
-  p->arm_proc =
-      GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                               "gnunet-service-arm", "-c", cfgname,
-#if VERBOSE_PEERS
-                               "-L", "DEBUG",
-#else
-                               "-L", "ERROR",
-#endif
-                               NULL);
+
+  if (GNUNET_SYSERR == GNUNET_TESTING_configuration_create (tth->tl_system, p->cfg))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Testing library failed to create unique configuration based on `%s'\n",
+                     cfgname);
+    GNUNET_free (p);
+    return NULL;
+  }
 
   p->no = peer_id;
+  /* Configure peer with configuration */
+  p->peer = GNUNET_TESTING_peer_configure (tth->tl_system, p->cfg, p->no, NULL, &emsg);
+  if (NULL == p->peer)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Testing library failed to create unique configuration based on `%s': `%s'\n",
+                     cfgname, emsg);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+    GNUNET_free_non_null (emsg);
+    return NULL;
+  }
+  GNUNET_free_non_null (emsg);
+  if (GNUNET_OK != GNUNET_TESTING_peer_start (p->peer))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Testing library failed to create unique configuration based on `%s'\n",
+                     cfgname);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+    return NULL;
+  }
+
+  memset(&dummy, '\0', sizeof (dummy));
+  GNUNET_TESTING_peer_get_identity (p->peer, &p->id);
+  if (0 == memcmp (&dummy, &p->id, sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Testing library failed to obtain peer identity for peer %u\n",
+                     p->no);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+    return NULL;
+  }
+  else
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                     "Peer %u configured with identity `%s'\n",
+                     p->no,
+                     GNUNET_i2s (&p->id));
+  }
+
   p->tth = tth;
   p->nc = nc;
   p->nd = nd;
@@ -279,146 +315,239 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct TransportTestingHandle * tth,
   else
     p->cb_cls = p;
 
-  p->th =
-      GNUNET_TRANSPORT_connect (p->cfg, NULL, p, &notify_receive,
-                                &notify_connect, &notify_disconnect);
-  GNUNET_assert (p->th != NULL);
+  p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p,
+                                    &notify_receive,
+                                    &notify_connect, &notify_disconnect);
+  if (NULL == p->th)
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Failed to connect to transport service for peer  `%s': `%s'\n",
+                     cfgname, emsg);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
+    return NULL;
+  }
 
   p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
   GNUNET_assert (p->ghh != NULL);
 
-  GNUNET_CONTAINER_DLL_insert(tth->p_head, tth->p_tail, p);
-
   return p;
 }
 
+/**
+* Restart the given peer
+* @param tth testing handle
+* @param p the peer
+* @param cfgname the cfg file used to restart
+* @param restart_cb callback to call when restarted
+* @param cb_cls callback closure
+* @return GNUNET_OK in success otherwise GNUNET_SYSERR
+*/
+int
+GNUNET_TRANSPORT_TESTING_restart_peer (struct GNUNET_TRANSPORT_TESTING_handle
+                                       *tth, struct PeerContext *p,
+                                       const char *cfgname,
+                                       GNUNET_TRANSPORT_TESTING_start_cb
+                                       restart_cb, void *cb_cls)
+{
+  GNUNET_assert (tth != NULL);
+  GNUNET_assert (p != NULL);
+  GNUNET_assert (NULL != p->peer);
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                   "Restarting peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
+
+  /* shutdown */
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                   "Stopping peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
+  if (NULL != p->ghh)
+    GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
+  p->ghh = NULL;
+
+  if (NULL != p->th)
+    GNUNET_TRANSPORT_disconnect (p->th);
+
+  if (GNUNET_SYSERR == GNUNET_TESTING_peer_stop(p->peer))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Failed to stop peer %u (`%s')\n", p->no, GNUNET_i2s (&p->id));
+    return GNUNET_SYSERR;
+  }
+
+  sleep (5);
+
+  /* restart */
+  if (GNUNET_SYSERR == GNUNET_TESTING_peer_start(p->peer))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
+                     "Failed to restart peer %u (`%s')\n",
+                     p->no, GNUNET_i2s (&p->id));
+    return GNUNET_SYSERR;
+  }
+
+  GNUNET_assert (p->th != NULL);
+  GNUNET_assert (p->start_cb == NULL);
+  p->start_cb = restart_cb;
+  p->cb_cls = cb_cls;
+
+  p->th = GNUNET_TRANSPORT_connect (p->cfg, NULL, p,
+                                    &notify_receive,
+                                    &notify_connect,
+                                    &notify_disconnect);
+  GNUNET_assert (NULL != p->th);
+
+  p->ghh = GNUNET_TRANSPORT_get_hello (p->th, &get_hello, p);
+  GNUNET_assert (p->ghh != NULL);
+  return GNUNET_OK;
+}
+
+
 /**
  * shutdown the given peer
+ * @param tth testing handle
  * @param p the peer
  */
 void
-GNUNET_TRANSPORT_TESTING_stop_peer (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_stop_peer (struct GNUNET_TRANSPORT_TESTING_handle *tth,
                                     struct PeerContext *p)
 {
   GNUNET_assert (p != NULL);
-
   if (p->ghh != NULL)
+  {
     GNUNET_TRANSPORT_get_hello_cancel (p->ghh);
-  p->ghh = NULL;
-
+    p->ghh = NULL;
+  }
   if (p->th != NULL)
-    GNUNET_TRANSPORT_disconnect (p->th);
-
-  if (NULL != p->arm_proc)
   {
-    if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    GNUNET_OS_process_wait (p->arm_proc);
-    GNUNET_OS_process_close (p->arm_proc);
-    p->arm_proc = NULL;
+    GNUNET_TRANSPORT_disconnect (p->th);
+    p->th = NULL;
   }
 
-  if (p->servicehome != NULL)
+  if (p->peer != NULL)
   {
-    GNUNET_DISK_directory_remove (p->servicehome);
-    GNUNET_free (p->servicehome);
+    if (GNUNET_OK != GNUNET_TESTING_peer_stop (p->peer))
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                       "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 (p->hello != NULL)
+  {
     GNUNET_free (p->hello);
-
+    p->hello = NULL;
+  }
   if (p->cfg != NULL)
+  {
     GNUNET_CONFIGURATION_destroy (p->cfg);
-
+    p->cfg = NULL;
+  }
   GNUNET_CONTAINER_DLL_remove (tth->p_head, tth->p_tail, p);
-
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                   "Peer %u (`%s') stopped \n", p->no,
+                   GNUNET_i2s (&p->id));
   GNUNET_free (p);
-  p = NULL;
 }
 
+
 /**
- * Initiate peer p1 to connect to peer p2
- * Get peer p2's HELLO and offer it to p1
- * p1 then tries to connect to p2
+ * Initiate a connection from p1 to p2 by offering p1 p2's HELLO message
+ *
+ * Remarks: start_peer's notify_connect callback can be called before.
+ *
+ * @param tth transport testing handle
  * @param p1 peer 1
  * @param p2 peer 2
- * @param cb the callback to call
- * @param cb_cls callback cls
- * @return connect context
+ * @param cb the callback to call when both peers notified that they are connected
+ * @param cls callback cls
+ * @return a connect request handle
  */
 GNUNET_TRANSPORT_TESTING_ConnectRequest
-GNUNET_TRANSPORT_TESTING_connect_peers (struct TransportTestingHandle * tth,
+GNUNET_TRANSPORT_TESTING_connect_peers (struct GNUNET_TRANSPORT_TESTING_handle *tth,
                                         struct PeerContext *p1,
                                         struct PeerContext *p2,
                                         GNUNET_TRANSPORT_TESTING_connect_cb cb,
-                                        void *cb_cls)
-
+                                        void *cls)
 {
+  GNUNET_assert (tth != NULL);
+
   struct ConnectingContext *cc =
       GNUNET_malloc (sizeof (struct ConnectingContext));
 
   GNUNET_assert (p1 != NULL);
   GNUNET_assert (p2 != NULL);
-
   cc->p1 = p1;
   cc->p2 = p2;
-
   cc->cb = cb;
-  cc->cb_cls = cb_cls;
-
+  if (cls != NULL)
+    cc->cb_cls = cls;
+  else
+    cc->cb_cls = cc;
   cc->th_p1 = p1->th;
-     /* GNUNET_TRANSPORT_connect (cc->p1->cfg, NULL, cc, NULL,
-                                &notify_connect_internal, NULL);*/
-
   cc->th_p2 = p2->th;
-      /* GNUNET_TRANSPORT_connect (cc->p2->cfg, NULL, cc, NULL,
-                                &notify_connect_internal, NULL);*/
-
   GNUNET_assert (cc->th_p1 != NULL);
   GNUNET_assert (cc->th_p2 != NULL);
-
   GNUNET_CONTAINER_DLL_insert (tth->cc_head, tth->cc_tail, cc);
-
   cc->tct = GNUNET_SCHEDULER_add_now (&try_connect, cc);
-  return cc;
-
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                   "New connect request %p\n", cc);
 
+  return cc;
 }
 
+
 /**
  * Cancel the request to connect two peers
  * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
- * @param cc a connect request handle
+ *
+ * @param tth transport testing handle
+ * @param ccr a connect request handle
  */
-void GNUNET_TRANSPORT_TESTING_connect_peers_cancel
-    (struct TransportTestingHandle * tth,
-        GNUNET_TRANSPORT_TESTING_ConnectRequest ccr)
+void
+GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
+                                               GNUNET_TRANSPORT_TESTING_handle
+                                               *tth,
+                                               GNUNET_TRANSPORT_TESTING_ConnectRequest
+                                               ccr)
 {
   struct ConnectingContext *cc = ccr;
 
+  GNUNET_assert (tth != NULL);
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing",
+                   "Canceling connect request %p!\n", cc);
+
   if (cc->tct != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel (cc->tct);
-
   cc->tct = GNUNET_SCHEDULER_NO_TASK;
 
   GNUNET_CONTAINER_DLL_remove (tth->cc_head, tth->cc_tail, cc);
-
   GNUNET_free (cc);
 }
 
+
+/**
+ * Clean up the transport testing
+ * @param tth transport testing handle
+ */
 void
-GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth)
+GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_handle *tth)
 {
   struct ConnectingContext *cc = tth->cc_head;
   struct ConnectingContext *ct = NULL;
   struct PeerContext *p = tth->p_head;
   struct PeerContext *t = NULL;
-  while (cc != NULL)
+
+  GNUNET_assert (tth != NULL);
+
+  while (cc != tth->cc_tail)
   {
     ct = cc->next;
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
-        "Developer forgot to cancel connect request!\n");
-    GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc);
+                     "Developer forgot to cancel connect request %p!\n", cc);
+    GNUNET_TRANSPORT_TESTING_connect_peers_cancel (tth, cc);
     cc = ct;
   }
 
@@ -426,18 +555,38 @@ GNUNET_TRANSPORT_TESTING_done (struct TransportTestingHandle * tth)
   {
     t = p->next;
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "transport-testing",
-        "Developer forgot to stop peer!\n");
+                     "Developer forgot to stop peer!\n");
     GNUNET_TRANSPORT_TESTING_stop_peer (tth, p);
     p = t;
   }
 
+  GNUNET_TESTING_system_destroy (tth->tl_system, GNUNET_YES);
+
   GNUNET_free (tth);
+  tth = NULL;
 }
 
-struct TransportTestingHandle *
+
+/**
+ * Initialize the transport testing
+ * @return transport testing handle
+ */
+struct GNUNET_TRANSPORT_TESTING_handle *
 GNUNET_TRANSPORT_TESTING_init ()
 {
-  struct TransportTestingHandle * tth = GNUNET_malloc (sizeof (struct TransportTestingHandle));
+  struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
+  /* prepare hostkeys */
+  tth = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TESTING_handle));
+
+  /* Init testing the testing lib */
+  tth->tl_system = GNUNET_TESTING_system_create ("transport-testing", NULL, NULL);
+  if (NULL == tth->tl_system)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to initialize testing library!\n"));
+    GNUNET_free (tth);
+    return NULL;
+  }
 
   return tth;
 }
@@ -452,14 +601,32 @@ GNUNET_TRANSPORT_TESTING_init ()
  * @param file the absolute file name, e.g. as found in argv[0]
  * @return extracted file name, has to be freed by caller
  */
-char *
+static char *
 extract_filename (const char *file)
 {
-  char *pch = strdup (file);
+  char *pch = GNUNET_strdup (file);
   char *backup = pch;
   char *filename = NULL;
   char *res;
-
+#if WINDOWS
+  if ((strlen (pch) >= 3) && pch[1] == ':')
+  {
+    if (NULL != strstr (pch, "\\"))
+    {
+      pch = strtok (pch, "\\");
+      while (pch != NULL)
+      {
+        pch = strtok (NULL, "\\");
+        if (pch != NULL)
+          filename = pch;
+      }
+    }
+  }
+  if (filename != NULL)
+    pch = filename; /* If we miss the next condition, filename = pch will
+                     * not harm us.
+                     */
+#endif
   if (NULL != strstr (pch, "/"))
   {
     pch = strtok (pch, "/");
@@ -475,11 +642,12 @@ extract_filename (const char *file)
   else
     filename = pch;
 
-  res = strdup (filename);
+  res = GNUNET_strdup (filename);
   GNUNET_free (backup);
   return res;
 }
 
+
 /**
  * Extracts the test filename from an absolute file name and removes the extension
  * @param file absolute file name
@@ -539,7 +707,8 @@ GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file, char **dest)
 
 
 /**
- * Extracts the plugin anme from an absolute file name and the test name
+ * Extracts the plugin name from an absolute file name and the test name
+ *
  * @param file absolute file name
  * @param test test name
  * @param dest where to store result
@@ -548,48 +717,45 @@ void
 GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file,
                                                const char *test, char **dest)
 {
+  char *filename;
+  char *dotexe;
   char *e = extract_filename (file);
   char *t = extract_filename (test);
 
-  char *filename = NULL;
-  char *dotexe;
-
-  if (e == NULL)
+  if (NULL == e)
     goto fail;
-
   /* remove "lt-" */
   filename = strstr (e, "tes");
-  if (filename == NULL)
+  if (NULL == filename)
     goto fail;
-
   /* remove ".exe" */
   if (NULL != (dotexe = strstr (filename, ".exe")))
     dotexe[0] = '\0';
 
   /* find last _ */
   filename = strstr (filename, t);
-  if (filename == NULL)
+  if (NULL == filename)
     goto fail;
-
   /* copy plugin */
   filename += strlen (t);
-  filename++;
+  if ('\0' != *filename)
+    filename++;
   GNUNET_asprintf (dest, "%s", filename);
   goto suc;
-
 fail:
   (*dest) = NULL;
 suc:
   GNUNET_free (t);
   GNUNET_free (e);
-
 }
 
+
 /**
  * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
  * if existing ".exe"-prefix and adds the peer-number
+ *
  * @param file filename of the test, e.g. argv[0]
- * @param cfgname where to write the result
+ * @param dest where to write the filename
  * @param count peer number
  */
 void
@@ -600,30 +766,22 @@ GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, char **dest,
   char *backup = filename;
   char *dotexe;
 
-  if (filename == NULL)
+  if (NULL == filename)
     goto fail;
-
   /* remove "lt-" */
   filename = strstr (filename, "tes");
-  if (filename == NULL)
+  if (NULL == filename)
     goto fail;
-
   /* remove ".exe" */
   if (NULL != (dotexe = strstr (filename, ".exe")))
     dotexe[0] = '\0';
-
-  goto suc;
-
+  GNUNET_asprintf (dest, "%s_peer%u.conf", filename, count);
+  GNUNET_free (backup);
+  return;
 fail:
   (*dest) = NULL;
-  return;
-
-suc:
-  /* create cfg filename */
-  GNUNET_asprintf (dest, "%s_peer%u.conf", filename, count);
   GNUNET_free (backup);
 }
 
 
-
-/* end of transport_testing.h */
+/* end of transport-testing.c */