-simplify logic

[oweals/gnunet.git] / src / transport / transport-testing.h

diff --git a/src/transport/transport-testing.h b/src/transport/transport-testing.h
index 0b1f2459160170b41f20d2cb136c97d0e65ad2e6..452ef7c8dfb1b3a14832961e74fcd30d4400569c 100644 (file)
--- a/src/transport/transport-testing.h
+++ b/src/transport/transport-testing.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2006, 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2006, 2009 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -24,14 +24,11 @@
  *
  * @author Matthias Wachs
  */
-
 #include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_hello_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_container_lib.h"
 #include "gnunet_transport_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 
 #define GNUNET_TRANSPORT_TESTING_ConnectRequest void *
@@ -156,7 +153,7 @@ struct ConnectingContext
   struct ConnectingContext *prev;
   struct PeerContext *p1;
   struct PeerContext *p2;
-  GNUNET_SCHEDULER_TaskIdentifier tct;
+  struct GNUNET_SCHEDULER_Task * tct;
   GNUNET_TRANSPORT_TESTING_connect_cb cb;
   void *cb_cls;
   struct GNUNET_TRANSPORT_Handle *th_p1;