-doxygen

[oweals/gnunet.git] / src / transport / test_transport_startonly.c

diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c
index 35c9e546b472365acf50518a418f65989325365b..2deb3f58b2517db7fdebd16a69313bec2389a610 100644 (file)
--- a/src/transport/test_transport_startonly.c
+++ b/src/transport/test_transport_startonly.c
@@ -27,22 +27,9 @@
  * C code apparently.
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_hello_lib.h"
-#include "gnunet_getopt_lib.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-#include "gnunet_scheduler_lib.h"
 #include "gnunet_transport_service.h"
-#include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
 /**
  * How long until we give up on transmitting the message?
  */
@@ -54,6 +41,8 @@ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
 
 static struct PeerContext *p1;
 
+struct GNUNET_TRANSPORT_TESTING_handle *tth;
+
 static int connected = GNUNET_NO;
 
 static int ret = 0;
@@ -70,6 +59,7 @@ end ()
     GNUNET_SCHEDULER_cancel (timeout_task);
     timeout_task = GNUNET_SCHEDULER_NO_TASK;
   }
+  GNUNET_TRANSPORT_TESTING_done (tth);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting\n");
 }
 
@@ -83,15 +73,14 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
 
   if (p1 != NULL)
-    GNUNET_TRANSPORT_TESTING_stop_peer (p1);
-
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
+  if (NULL != tth)
+    GNUNET_TRANSPORT_TESTING_done (tth);
   ret = GNUNET_SYSERR;
 }
 
 static void
-notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
-                const struct GNUNET_TRANSPORT_ATS_Information *ats,
-                uint32_t ats_count)
+notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n",
               GNUNET_i2s (peer));
@@ -107,9 +96,7 @@ notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *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_MessageHeader *message)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving\n");
 }
@@ -119,17 +106,20 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  timeout_task =
-    GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
+  tth = GNUNET_TRANSPORT_TESTING_init ();
+
+  timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
 
   i = 1;
-  fprintf(stderr,"%i",i);
+  FPRINTF (stderr, "%i", i);
   while (i <= ITERATIONS)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n");
-    p1 = GNUNET_TRANSPORT_TESTING_start_peer ("test_transport_startonly.conf",
-                                              &notify_receive, &notify_connect,
-                                              &notify_disconnect, p1);
+    p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth,
+                                              "test_transport_startonly.conf",
+                                              1, &notify_receive,
+                                              &notify_connect,
+                                              &notify_disconnect, NULL, p1);
 
 
     if (p1 != NULL)
@@ -140,35 +130,28 @@ run (void *cls, char *const *args, const char *cfgfile,
     GNUNET_assert (p1 != NULL);
     GNUNET_assert (p1->th != NULL);
 
-    //sleep (5);
-
-    GNUNET_TRANSPORT_TESTING_stop_peer(p1);
+    GNUNET_TRANSPORT_TESTING_stop_peer (tth, p1);
 
     i++;
     if (i <= ITERATIONS)
-      fprintf(stderr,"..%i",i);
+      FPRINTF (stderr, "..%i", i);
   }
-  fprintf(stderr,"\n");
-  end();
+
+  FPRINTF (stderr, "%s",  "\n");
+  end ();
 }
 
 int
 main (int argc, char *argv[])
 {
   GNUNET_log_setup ("test_transport_testing",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
+
                     NULL);
 
   char *const argv_1[] = { "test_transport_testing",
     "-c",
     "test_transport_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };