arm related changes to util things, enabling leaky sockets and shutdown messages from services

1 files changed, 11 insertions, 6 deletions

diff --git a/src/util/test_service.c b/src/util/test_service.c
index a40630c64..544f86fba 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -43,6 +43,16 @@ static struct GNUNET_SERVICE_Context *sctx;
 
 static int ok = 1;
 
+void
+end_cont (void *cls,
+          int reason)
+{
+  if (sctx != NULL)
+    GNUNET_SERVICE_stop (sctx);
+  else
+    GNUNET_SCHEDULER_shutdown (sched);
+  ok = 0;
+}
 
 static void
 end_it (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -50,12 +60,7 @@ end_it (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_CLIENT_Connection *client = cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down service\n");
-  GNUNET_CLIENT_service_shutdown (client);
-  if (sctx != NULL)
-    GNUNET_SERVICE_stop (sctx);
-  else
-    GNUNET_SCHEDULER_shutdown (sched);
-  ok = 0;
+  GNUNET_CLIENT_service_shutdown (sched, client, GNUNET_TIME_UNIT_FOREVER_REL, &end_cont, NULL);
 }