fix

[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 f22c15300918eff64e884c786536ebcc1cd3a113..21c706b07989a678280b7a4051b8e15f7e0d9aaf 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
@@ -30,7 +30,7 @@
 #include "gnunet_server_lib.h"
 #include "gnunet_time_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_EXTRA_LOGGING
 
 #define PORT 22335
 
@@ -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;
@@ -51,6 +49,7 @@ static void
 send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_SERVER_Client *argclient = cls;
+
   GNUNET_assert (ok == 3);
   ok++;
   GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
@@ -58,9 +57,8 @@ send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-recv_cb (void *cls,
-         struct GNUNET_SERVER_Client *argclient,
-         const struct GNUNET_MessageHeader *message)
+recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
+        const struct GNUNET_MessageHeader *message)
 {
   void *addr;
   size_t addrlen;
@@ -68,8 +66,8 @@ recv_cb (void *cls,
   struct sockaddr_in *have;
 
   GNUNET_assert (GNUNET_OK ==
-                 GNUNET_SERVER_client_get_address (argclient,
-                                                   &addr, &addrlen));
+                GNUNET_SERVER_client_get_address (argclient, &addr,
+                                                  &addrlen));
 
   GNUNET_assert (addrlen == sizeof (struct sockaddr_in));
   have = addr;
@@ -86,14 +84,13 @@ recv_cb (void *cls,
     {
     case 2:
       ok++;
-      GNUNET_SCHEDULER_add_delayed (sched,
-                                    GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_MILLISECONDS, 50),
-                                    &send_done, argclient);
+      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:
@@ -123,10 +120,11 @@ clean_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 notify_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
 {
+  if (client == NULL)
+    return;
   GNUNET_assert (ok == 5);
   ok = 0;
-  GNUNET_SCHEDULER_add_now (sched,
-                           &clean_up, NULL);
+  GNUNET_SCHEDULER_add_now (&clean_up, NULL);
 }
 
 
@@ -158,23 +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,
-                                 NULL,
-                                 (const struct sockaddr *) &sa,
-                                 sizeof (sa),
-                                 1024,
-                                 GNUNET_TIME_relative_multiply
-                                 (GNUNET_TIME_UNIT_MILLISECONDS, 250),
-                                 GNUNET_NO);
+  server =
+    GNUNET_SERVER_create (NULL, NULL, sap, slens,
+                         GNUNET_TIME_relative_multiply
+                         (GNUNET_TIME_UNIT_MILLISECONDS, 250), GNUNET_NO);
   GNUNET_assert (server != NULL);
   handlers[0].callback_cls = cls;
   GNUNET_SERVER_add_handlers (server, handlers);
@@ -182,16 +180,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   cfg = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_set_value_number (cfg, "test", "PORT", PORT);
   GNUNET_CONFIGURATION_set_value_string (cfg, "test", "HOSTNAME",
-                                         "localhost");
+                                        "localhost");
   GNUNET_CONFIGURATION_set_value_string (cfg, "resolver", "HOSTNAME",
-                                         "localhost");
-  client = GNUNET_CLIENT_connect (tc->sched, "test", cfg);
+                                        "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),
-                                       GNUNET_NO, &notify_ready, NULL);
+  GNUNET_CLIENT_notify_transmit_ready (client, 256,
+                                      GNUNET_TIME_relative_multiply
+                                      (GNUNET_TIME_UNIT_MILLISECONDS, 250),
+                                      GNUNET_NO, &notify_ready, NULL);
 }
 
 
@@ -216,11 +213,11 @@ main (int argc, char *argv[])
 
   GNUNET_log_setup ("test_server_with_client",
 #if VERBOSE
-                    "DEBUG",
+                   "DEBUG",
 #else
-                    "WARNING",
+                   "WARNING",
 #endif
-                    NULL);
+                   NULL);
   ret += check ();
 
   return ret;