Link libgnunetblockgroup to libgnunetblock

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

diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index 2d08acc3cd1421b25af7a914e8d207260ef17473..a6345b10a70a280c8432cb64d5884a79e63bb37f 100644 (file)
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,20 +14,16 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_connection_addressing.c
  * @brief tests for connection.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
 
-#define VERBOSE GNUNET_NO
 
 #define PORT 12435
 
@@ -99,13 +95,14 @@ receive_check (void *cls, const void *buf, size_t available,
   else
   {
     *ok = 0;
-    GNUNET_CONNECTION_destroy (asock, GNUNET_YES);
+    GNUNET_CONNECTION_destroy (csock);
+    GNUNET_CONNECTION_destroy (asock);
   }
 }
 
 
 static void
-run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+run_accept (void *cls)
 {
   void *addr;
   size_t alen;
@@ -128,7 +125,7 @@ run_accept (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   expect.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
   GNUNET_assert (0 == memcmp (&expect, v4, alen));
   GNUNET_free (addr);
-  GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (lsock);
   GNUNET_CONNECTION_receive (asock, 1024,
                              GNUNET_TIME_relative_multiply
                              (GNUNET_TIME_UNIT_SECONDS, 5), &receive_check,
@@ -143,8 +140,9 @@ make_hello (void *cls, size_t size, void *buf)
   return 12;
 }
 
+
 static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
 {
   struct sockaddr_in v4;
 
@@ -167,42 +165,22 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                  GNUNET_CONNECTION_notify_transmit_ready (csock, 12,
                                                           GNUNET_TIME_UNIT_SECONDS,
                                                           &make_hello, NULL));
-  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
   GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, ls, &run_accept,
                                  cls);
 }
 
 
-/**
- * Main method, starts scheduler with task ,
- * checks that "ok" is correct at the end.
- */
-static int
-check ()
-{
-  int ok;
-
-  ok = 1;
-  GNUNET_SCHEDULER_run (&task, &ok);
-  return ok;
-}
-
-
-
 int
 main (int argc, char *argv[])
 {
-  int ret = 0;
+  int ok;
 
   GNUNET_log_setup ("test_connection_addressing",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-  ret += check ();
-  return ret;
+  ok = 1;
+  GNUNET_SCHEDULER_run (&task, &ok);
+  return ok;
 }
 
 /* end of test_connection_addressing.c */