-remove async ecc key generation, not needed

[oweals/gnunet.git] / src / util / test_connection_transmit_cancel.c

diff --git a/src/util/test_connection_transmit_cancel.c b/src/util/test_connection_transmit_cancel.c
index bb5415d61a42acc3368bd56e8fed40f9f018aa0e..195ac689bb881eec983fbed12bc9895378ad66b7 100644 (file)
--- a/src/util/test_connection_transmit_cancel.c
+++ b/src/util/test_connection_transmit_cancel.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 
      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
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but


@@ -27,8 +27,6 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 

-#define VERBOSE GNUNET_NO
-

 #define PORT 12435
 
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 #define PORT 12435
 
 static struct GNUNET_CONFIGURATION_Handle *cfg;


@@ -43,61 +41,39 @@ not_run (void *cls, size_t size, void *buf)
 
 
 static void
 
 
 static void

-task_transmit_cancel (void *cls,
-                      const struct GNUNET_SCHEDULER_TaskContext *tc)
+task_transmit_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)

 {
   int *ok = cls;
   struct GNUNET_CONNECTION_TransmitHandle *th;
   struct GNUNET_CONNECTION_Handle *csock;
 
 {
   int *ok = cls;
   struct GNUNET_CONNECTION_TransmitHandle *th;
   struct GNUNET_CONNECTION_Handle *csock;
 

-  csock = GNUNET_CONNECTION_create_from_connect (tc->sched, cfg,
-                                                 "localhost", PORT, 1024);
+  csock = GNUNET_CONNECTION_create_from_connect (cfg, "localhost", PORT);

   GNUNET_assert (csock != NULL);
   GNUNET_assert (csock != NULL);

-  th = GNUNET_CONNECTION_notify_transmit_ready (csock,
-                                                12,
+  th = GNUNET_CONNECTION_notify_transmit_ready (csock, 12,

                                                 GNUNET_TIME_UNIT_MINUTES,
                                                 &not_run, cls);
                                                 GNUNET_TIME_UNIT_MINUTES,
                                                 &not_run, cls);

+  GNUNET_assert (NULL != th);

   GNUNET_CONNECTION_notify_transmit_ready_cancel (th);
   GNUNET_CONNECTION_notify_transmit_ready_cancel (th);

-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (csock);

   *ok = 0;
 }
 
 
   *ok = 0;
 }
 
 

-
-
-/**
- * Main method, starts scheduler with task_timeout.
- */
-static int
-check_transmit_cancel ()
+int
+main (int argc, char *argv[])

 {
   int ok;
 
 {
   int ok;
 

+  GNUNET_log_setup ("test_connection_transmit_cancel",
+                    "WARNING",
+                    NULL);

   ok = 1;
   cfg = GNUNET_CONFIGURATION_create ();
   ok = 1;
   cfg = GNUNET_CONFIGURATION_create ();

-  GNUNET_CONFIGURATION_set_value_string (cfg,
-                                         "resolver", "HOSTNAME", "localhost");
+  GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
+                                         "localhost");

   GNUNET_SCHEDULER_run (&task_transmit_cancel, &ok);
   GNUNET_CONFIGURATION_destroy (cfg);
   return ok;
 }
 
   GNUNET_SCHEDULER_run (&task_transmit_cancel, &ok);
   GNUNET_CONFIGURATION_destroy (cfg);
   return ok;
 }
 

-
-int
-main (int argc, char *argv[])
-{
-  int ret = 0;
-
-  GNUNET_log_setup ("test_connection_transmit_cancel",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret += check_transmit_cancel ();
-
-  return ret;
-}
-

 /* end of test_connection_transmit_cancel.c */
 /* end of test_connection_transmit_cancel.c */