WiP

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

diff --git a/src/util/test_server_with_client.c b/src/util/test_server_with_client.c
index e5eb50d8eda08102d8e43c1381ea9af4ab959f3b..5c36b7b03ca3cff8d80af3c97897a12842aef65d 100644 (file)
--- a/src/util/test_server_with_client.c
+++ b/src/util/test_server_with_client.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
-     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
@@ -41,8 +41,6 @@ static struct GNUNET_SERVER_Handle *server;
 
 static struct GNUNET_CLIENT_Connection *client;
 
-static struct GNUNET_SCHEDULER_Handle *sched;
-
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static int ok;
@@ -74,6 +72,9 @@ recv_cb (void *cls,
   GNUNET_assert (addrlen == sizeof (struct sockaddr_in));
   have = addr;
   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 = have->sin_port;
   sa.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
@@ -83,17 +84,13 @@ recv_cb (void *cls,
     {
     case 2:
       ok++;
-      GNUNET_SCHEDULER_add_delayed (sched,
-                                    GNUNET_YES,
-                                    GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                    GNUNET_SCHEDULER_NO_TASK,
-                                    GNUNET_TIME_relative_multiply
+      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_MILLISECONDS, 50),
                                     &send_done, argclient);
       break;
     case 4:
       ok++;
-      GNUNET_CLIENT_disconnect (client);
+      GNUNET_CLIENT_disconnect (client, GNUNET_YES);
       GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
       break;
     default:
@@ -103,6 +100,16 @@ recv_cb (void *cls,
 }
 
 
+static void
+clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_SERVER_destroy (server);
+  server = NULL;
+  GNUNET_CONFIGURATION_destroy (cfg);
+  cfg = NULL;
+}
+
+
 /**
  * Functions with this signature are called whenever a client
  * is disconnected on the network level.
@@ -113,10 +120,11 @@ recv_cb (void *cls,
 static void
 notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
 {
+  if (client == NULL)
+    return;
   GNUNET_assert (ok == 5);
   ok = 0;
-  GNUNET_SCHEDULER_shutdown (sched);
-  GNUNET_CONFIGURATION_destroy (cfg);
+  GNUNET_SCHEDULER_add_now (&clean_up, NULL);
 }
 
 
@@ -148,17 +156,23 @@ static void
 task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_in sa;
+  struct sockaddr * sap[2];
+  socklen_t slens[2];
 
-  sched = tc->sched;
+  sap[0] = (struct sockaddr*) &sa;
+  slens[0] = sizeof (sa);
+  sap[1] = NULL;
+  slens[1] = 0;
   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);
-  server = GNUNET_SERVER_create (tc->sched,
-                                 NULL,
+  server = GNUNET_SERVER_create (NULL,
                                  NULL,
-                                 (const struct sockaddr *) &sa,
-                                 sizeof (sa),
-                                 1024,
+                                 sap,
+                                slens,
                                  GNUNET_TIME_relative_multiply
                                  (GNUNET_TIME_UNIT_MILLISECONDS, 250),
                                  GNUNET_NO);
@@ -170,13 +184,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT);
   GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME",
                                          "localhost");
-  client = GNUNET_CLIENT_connect (tc->sched, "test", cfg);
+  GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
+                                         "localhost");
+  client = GNUNET_CLIENT_connect ("test", cfg);
   GNUNET_assert (client != NULL);
   GNUNET_CLIENT_notify_transmit_ready (client,
                                        256,
                                        GNUNET_TIME_relative_multiply
                                        (GNUNET_TIME_UNIT_MILLISECONDS, 250),
-                                       &notify_ready, NULL);
+                                       GNUNET_NO, &notify_ready, NULL);
 }