asserts

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

diff --git a/src/util/test_server.c b/src/util/test_server.c
index ae5609de0a5fce6be3d8fbfeed8c44b7e7115437..5d714d6f92d72c941c9a2b0ba30c5610175f9b6c 100644 (file)
--- a/src/util/test_server.c
+++ b/src/util/test_server.c
@@ -100,9 +100,6 @@ my_receive (void *cls,
       stctx->cb = receiver;
       stctx->cb_cls = receiver_cls;
       ret = GNUNET_SCHEDULER_add_delayed (sched,
-                                          GNUNET_NO,
-                                          GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                          GNUNET_SCHEDULER_NO_TASK,
                                           timeout, &signal_timeout, stctx);
       break;
     default:
@@ -155,7 +152,7 @@ my_check (void *cls)
 }
 
 
-static void my_destroy (void *cls);
+static void my_destroy (void *cls, int persist);
 
 
 struct CopyContext
@@ -220,7 +217,7 @@ static struct GNUNET_SERVER_MessageHandler handlers[] = {
 
 
 static void
-my_destroy (void *cls)
+my_destroy (void *cls, int persist)
 {
   int *ok = cls;
   GNUNET_assert (5 == *ok);
@@ -235,7 +232,13 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_in sa;
   struct GNUNET_MessageHeader msg;
+  struct sockaddr * sap[2];
+  socklen_t slens[2];
 
+  sap[0] = (struct sockaddr*) &sa;
+  slens[0] = sizeof (sa);
+  sap[1] = NULL;
+  slens[1] = 0;
   sched = tc->sched;
   memset (&sa, 0, sizeof (sa));
 #if HAVE_SOCKADDR_IN_SIN_LEN
@@ -246,8 +249,8 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   server = GNUNET_SERVER_create (tc->sched,
                                  NULL,
                                  NULL,
-                                 (const struct sockaddr *) &sa,
-                                 sizeof (sa),
+                                 sap,
+                                slens,
                                  1024,
                                  GNUNET_TIME_relative_multiply
                                  (GNUNET_TIME_UNIT_MILLISECONDS, 250),