proper shutdown

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

diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index 338caa737820eff1ed3e572ad9c160e54cb91371..1e6720235934d5b5dfc6b7a48057a4ff6ace77b9 100644 (file)
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_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


@@ -38,11 +38,9 @@ static struct GNUNET_CONNECTION_Handle *asock;
 
 static struct GNUNET_CONNECTION_Handle *lsock;
 
 
 static struct GNUNET_CONNECTION_Handle *lsock;
 

-static struct GNUNET_NETWORK_Descriptor *ls;
-
-static GNUNET_SCHEDULER_TaskIdentifier receive_task;
-
+static struct GNUNET_NETWORK_Handle *ls;

 
 

+static struct GNUNET_CONFIGURATION_Handle *cfg;

 
 
 /**
 
 
 /**


@@ -50,21 +48,28 @@ static GNUNET_SCHEDULER_TaskIdentifier receive_task;
  *
  * @return NULL on error, otherwise the listen socket
  */
  *
  * @return NULL on error, otherwise the listen socket
  */

-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *

 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;
 open_listen_socket ()
 {
   const static int on = 1;
   struct sockaddr_in sa;

-  struct GNUNET_NETWORK_Descriptor *desc;
+  struct GNUNET_NETWORK_Handle *desc;

 
   memset (&sa, 0, sizeof (sa));
 
   memset (&sa, 0, sizeof (sa));

+#if HAVE_SOCKADDR_IN_SIN_LEN
+  sa.sin_len = sizeof (sa);
+#endif
+  sa.sin_family = AF_INET;

   sa.sin_port = htons (PORT);
   sa.sin_port = htons (PORT);

-  desc = GNUNET_NETWORK_socket_socket (AF_INET, SOCK_STREAM, 0);
+  desc = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);

   GNUNET_assert (desc != NULL);
   GNUNET_assert (desc != NULL);

-  if (GNUNET_NETWORK_socket_setsockopt (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
+  if (GNUNET_NETWORK_socket_setsockopt
+      (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)

     GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                 "setsockopt");
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                 "setsockopt");

-  GNUNET_assert (GNUNET_NETWORK_socket_bind (desc, &sa, sizeof (sa)) >= 0);
+  GNUNET_assert (GNUNET_NETWORK_socket_bind
+                 (desc, (const struct sockaddr *) &sa,
+                  sizeof (sa)) == GNUNET_OK);

   GNUNET_NETWORK_socket_listen (desc, 5);
   return desc;
 }
   GNUNET_NETWORK_socket_listen (desc, 5);
   return desc;
 }


@@ -85,17 +90,15 @@ static void
 run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 
 run_accept_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 

-  asock = GNUNET_CONNECTION_create_from_accept (tc->sched,
-                                                    NULL, NULL, ls, 1024);
+  asock = GNUNET_CONNECTION_create_from_accept (NULL, NULL, ls);

   GNUNET_assert (asock != NULL);
   GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));
   GNUNET_assert (asock != NULL);
   GNUNET_assert (GNUNET_YES == GNUNET_CONNECTION_check (asock));

-  GNUNET_CONNECTION_destroy (lsock);
-  receive_task
-    = GNUNET_CONNECTION_receive (asock,
-                              1024,
-                              GNUNET_TIME_relative_multiply
-                              (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive,
-                              cls);
+  GNUNET_CONNECTION_destroy (lsock, GNUNET_YES);
+  GNUNET_CONNECTION_receive (asock,
+                             1024,
+                             GNUNET_TIME_relative_multiply
+                             (GNUNET_TIME_UNIT_SECONDS, 5), &dead_receive,
+                             cls);

 }
 
 
 }
 
 


@@ -103,9 +106,9 @@ static void
 receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   int *ok = cls;
 receive_cancel_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   int *ok = cls;

-  GNUNET_CONNECTION_receive_cancel (asock, receive_task);
-  GNUNET_CONNECTION_destroy (csock);
-  GNUNET_CONNECTION_destroy (asock);
+  GNUNET_CONNECTION_receive_cancel (asock);
+  GNUNET_CONNECTION_destroy (csock, GNUNET_YES);
+  GNUNET_CONNECTION_destroy (asock, GNUNET_YES);

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


@@ -115,22 +118,14 @@ static void
 task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ls = open_listen_socket ();
 task_receive_cancel (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   ls = open_listen_socket ();

-  lsock = GNUNET_CONNECTION_create_from_existing (tc->sched, ls, 0);
+  lsock = GNUNET_CONNECTION_create_from_existing (ls);

   GNUNET_assert (lsock != NULL);
   GNUNET_assert (lsock != NULL);

-  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 (csock != NULL);

-  GNUNET_SCHEDULER_add_read_net (tc->sched,
-                             GNUNET_NO,
-                             GNUNET_SCHEDULER_PRIORITY_HIGH,
-                             GNUNET_SCHEDULER_NO_TASK,
-                             GNUNET_TIME_UNIT_FOREVER_REL,
-                             ls, &run_accept_cancel, cls);
-  GNUNET_SCHEDULER_add_delayed (tc->sched,
-                                GNUNET_NO,
-                                GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                GNUNET_SCHEDULER_NO_TASK,
-                                GNUNET_TIME_UNIT_SECONDS,
+  GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
+                                 ls, &run_accept_cancel, cls);
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,

                                 &receive_cancel_task, cls);
 }
 
                                 &receive_cancel_task, cls);
 }
 


@@ -145,7 +140,11 @@ check_receive_cancel ()
   int ok;
 
   ok = 1;
   int ok;
 
   ok = 1;

+  cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_CONFIGURATION_set_value_string (cfg,
+                                         "resolver", "HOSTNAME", "localhost");

   GNUNET_SCHEDULER_run (&task_receive_cancel, &ok);
   GNUNET_SCHEDULER_run (&task_receive_cancel, &ok);

+  GNUNET_CONFIGURATION_destroy (cfg);

   return ok;
 }
 
   return ok;
 }