X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_connection_timeout_no_connect.c;h=cf1f8ecde2967c3ddf7c9a8ddd08087b30d5e28d;hb=267f7c5a9a354b8959607c7bc031906c02b61be4;hp=c37824c25ffa7e257674e6e660873a8c69115b27;hpb=38b29592cf2e8b816cab68579e07e2477153f739;p=oweals%2Fgnunet.git

diff --git a/src/util/test_connection_timeout_no_connect.c b/src/util/test_connection_timeout_no_connect.c
index c37824c25..cf1f8ecde 100644
--- a/src/util/test_connection_timeout_no_connect.c
+++ b/src/util/test_connection_timeout_no_connect.c
@@ -22,12 +22,7 @@
  * @brief tests for connection.c, doing timeout which connect failure
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
-
-#define VERBOSE GNUNET_NO
+#include "gnunet_util_lib.h"
 
 #define PORT 13425
 
@@ -39,10 +34,8 @@ static size_t
 handle_timeout (void *cls, size_t size, void *buf)
 {
   int *ok = cls;
-#if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received timeout signal.\n");
-#endif
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received timeout signal.\n");
   GNUNET_assert (size == 0);
   GNUNET_assert (buf == NULL);
   *ok = 0;
@@ -53,50 +46,31 @@ handle_timeout (void *cls, size_t size, void *buf)
 static void
 task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  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 (NULL !=
-                 GNUNET_CONNECTION_notify_transmit_ready (csock,
-                                                          1024,
+                 GNUNET_CONNECTION_notify_transmit_ready (csock, 1024,
                                                           GNUNET_TIME_UNIT_SECONDS,
                                                           &handle_timeout,
                                                           cls));
 }
 
 
-
-/**
- * Main method, starts scheduler with task_timeout.
- */
-static int
-check_timeout ()
+int
+main (int argc, char *argv[])
 {
   int ok;
 
+  GNUNET_log_setup ("test_connection_timeout_no_connect",
+                    "WARNING",
+                    NULL);
   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_timeout, &ok);
   GNUNET_CONFIGURATION_destroy (cfg);
   return ok;
 }
 
-int
-main (int argc, char *argv[])
-{
-  int ret = 0;
-
-  GNUNET_log_setup ("test_connection_timeout_no_connect",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  ret += check_timeout ();
-  return ret;
-}
-
 /* end of test_connection_timeout_no_connect.c */