Don't shadow the system() function

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

diff --git a/src/util/test_connection_timeout_no_connect.c b/src/util/test_connection_timeout_no_connect.c
index 6a6d32f382a349891e788f28237acff34844751b..8e9a717ba91b804e0a1448bf2fe03b5e4b7c3a21 100644 (file)
--- a/src/util/test_connection_timeout_no_connect.c
+++ b/src/util/test_connection_timeout_no_connect.c
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
 /*
      This file is part of GNUnet.

-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 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
 
      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


@@ -22,25 +22,20 @@
  * @brief tests for connection.c, doing timeout which connect failure
  */
 #include "platform.h"
  * @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
 
 static struct GNUNET_CONNECTION_Handle *csock;
 
 
 #define PORT 13425
 
 static struct GNUNET_CONNECTION_Handle *csock;
 

+static struct GNUNET_CONFIGURATION_Handle *cfg;
+

 static size_t
 handle_timeout (void *cls, size_t size, void *buf)
 {
   int *ok = cls;
 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;
   GNUNET_assert (size == 0);
   GNUNET_assert (buf == NULL);
   *ok = 0;


@@ -51,45 +46,31 @@ handle_timeout (void *cls, size_t size, void *buf)
 static void
 task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 static void
 task_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {

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

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

-                 GNUNET_CONNECTION_notify_transmit_ready (csock,
-                                                       1024,
-                                                       GNUNET_TIME_UNIT_SECONDS,
-                                                       &handle_timeout, cls));
+                 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 ok;
-
-  ok = 1;
-  GNUNET_SCHEDULER_run (&task_timeout, &ok);
-  return ok;
-}
-

 int
 main (int argc, char *argv[])
 {
 int
 main (int argc, char *argv[])
 {

-  int ret = 0;
+  int ok;

 
   GNUNET_log_setup ("test_connection_timeout_no_connect",
 
   GNUNET_log_setup ("test_connection_timeout_no_connect",

-#if VERBOSE
-                    "DEBUG",
-#else

                     "WARNING",
                     "WARNING",

-#endif

                     NULL);
                     NULL);

-  ret += check_timeout ();
-  return ret;
+  ok = 1;
+  cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
+                                         "localhost");
+  GNUNET_SCHEDULER_run (&task_timeout, &ok);
+  GNUNET_CONFIGURATION_destroy (cfg);
+  return ok;

 }
 
 /* end of test_connection_timeout_no_connect.c */
 }
 
 /* end of test_connection_timeout_no_connect.c */