code clean up

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

diff --git a/src/util/test_service.c b/src/util/test_service.c
index e8e3f8741d64901b427f561243a5c9061a4c7219..5a4fe27d03055c390f794ab67881bd6c9b3bf2cb 100644 (file)
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -30,6 +30,7 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_time_lib.h"
 
+
 #define VERBOSE GNUNET_NO
 
 #define PORT 12435
@@ -40,17 +41,7 @@ static struct GNUNET_SCHEDULER_Handle *sched;
 
 static struct GNUNET_SERVICE_Context *sctx;
 
-static void
-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);
-  GNUNET_CLIENT_disconnect (client);
-  if (sctx != NULL)
-    GNUNET_SERVICE_stop (sctx);
-}
+static int ok = 1;
 
 
 static size_t
@@ -63,23 +54,20 @@ build_msg (void *cls, size_t size, void *buf)
   GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
   msg->type = htons (MY_TYPE);
   msg->size = htons (sizeof (struct GNUNET_MessageHeader));
-  GNUNET_SCHEDULER_add_continuation (sched,
-                                     GNUNET_YES,
-                                     &end_it,
-                                     client,
-                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_CLIENT_disconnect (client, GNUNET_NO);
   return sizeof (struct GNUNET_MessageHeader);
 }
 
+
 static void
 ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   struct GNUNET_CLIENT_Connection *client;
 
+  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
   sched = tc->sched;
-  GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
   client = GNUNET_CLIENT_connect (tc->sched, "test_service", cfg);
   GNUNET_assert (client != NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -87,9 +75,17 @@ ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_CLIENT_notify_transmit_ready (client,
                                        sizeof (struct GNUNET_MessageHeader),
                                        GNUNET_TIME_UNIT_SECONDS,
-                                       &build_msg, client);
+                                       GNUNET_NO, &build_msg, client);
 }
 
+static void
+do_stop (void *cls,
+        const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_SERVICE_stop (sctx);
+}
+
+
 static void
 recv_cb (void *cls,
          struct GNUNET_SERVER_Client *client,
@@ -97,6 +93,11 @@ recv_cb (void *cls,
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving client message...\n");
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
+  if (sctx != NULL)
+    GNUNET_SCHEDULER_add_now (sched, &do_stop, NULL);
+  else
+    GNUNET_SCHEDULER_shutdown (sched);
+  ok = 0;
 }
 
 static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
@@ -104,6 +105,9 @@ static struct GNUNET_SERVER_MessageHandler myhandlers[] = {
   {NULL, NULL, 0, 0}
 };
 
+
+
+
 static void
 runner (void *cls,
         struct GNUNET_SCHEDULER_Handle *sched,
@@ -114,16 +118,10 @@ runner (void *cls,
   GNUNET_SERVER_add_handlers (server, myhandlers);
   GNUNET_CLIENT_service_test (sched,
                               "test_service",
-                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready, (void*) cfg);
+                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready,
+                              (void *) cfg);
 }
 
-static void
-term (void *cls, 
-      const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  int *ok = cls;
-  *ok = 0;
-}
 
 /**
  * Main method, starts scheduler with task1,
@@ -132,7 +130,7 @@ term (void *cls,
 static int
 check ()
 {
-  int ok = 1;
+  ok = 1;
   char *const argv[] = {
     "test_service",
     "-c",
@@ -150,7 +148,8 @@ check ()
                  GNUNET_SERVICE_run (5,
                                      argv,
                                      "test_service",
-                                     &runner, &ok, &term, &ok));
+                                     GNUNET_SERVICE_OPTION_NONE,
+                                     &runner, &ok));
   GNUNET_assert (0 == ok);
   return ok;
 }
@@ -170,7 +169,7 @@ ready6 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_CLIENT_notify_transmit_ready (client,
                                        sizeof (struct GNUNET_MessageHeader),
                                        GNUNET_TIME_UNIT_SECONDS,
-                                       &build_msg, client);
+                                       GNUNET_NO, &build_msg, client);
 }
 
 static void
@@ -183,7 +182,8 @@ runner6 (void *cls,
   GNUNET_SERVER_add_handlers (server, myhandlers);
   GNUNET_CLIENT_service_test (sched,
                               "test_service6",
-                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready6, (void*) cfg);
+                              cfg, GNUNET_TIME_UNIT_SECONDS, &ready6,
+                              (void *) cfg);
 }
 
 /**
@@ -193,7 +193,6 @@ runner6 (void *cls,
 static int
 check6 ()
 {
-  int ok = 1;
   char *const argv[] = {
     "test_service6",
     "-c",
@@ -211,50 +210,20 @@ check6 ()
                  GNUNET_SERVICE_run (5,
                                      argv,
                                      "test_service6",
-                                     &runner6, &ok, &term, &ok));
+                                     GNUNET_SERVICE_OPTION_NONE,
+                                     &runner6, &ok));
   GNUNET_assert (0 == ok);
   return ok;
 }
 
 
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check6d ()
-{
-  int ok = 1;
-  char *const argv[] = {
-    "test_service6",
-    "-c",
-    "test_service_data.conf",
-    "-L",
-#if VERBOSE
-    "DEBUG",
-#else
-    "WARNING",
-#endif
-    "-d",
-    NULL
-  };
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting V6 as daemon\n");
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_SERVICE_run (6,
-                                     argv,
-                                     "test_service6",
-                                     &runner6, &ok, &term, &ok));
-  GNUNET_break (0 == ok);
-  return ok;
-}
-
 
 static void
 start_stop_main (void *cls,
                  struct GNUNET_SCHEDULER_Handle *sched,
                  char *const *args,
-                 const char *cfgfile, 
-                const struct GNUNET_CONFIGURATION_Handle *cfg)
+                 const char *cfgfile,
+                 const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   int *ret = cls;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -300,7 +269,7 @@ int
 main (int argc, char *argv[])
 {
   int ret = 0;
-  int s;
+  struct GNUNET_NETWORK_Handle *s = NULL;
 
   GNUNET_log_setup ("test-service",
 #if VERBOSE
@@ -311,8 +280,12 @@ main (int argc, char *argv[])
                     NULL);
   ret += check ();
   ret += check ();
-  s = SOCKET (PF_INET6, SOCK_STREAM, 0);
-  if (s == -1)
+
+  // FIXME
+#ifndef MINGW
+  s = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_STREAM, 0);
+#endif
+  if (NULL == s)
     {
       if ((errno == ENOBUFS) ||
           (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES))
@@ -326,9 +299,8 @@ main (int argc, char *argv[])
     }
   else
     {
-      GNUNET_break (0 == CLOSE (s));
+      GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
       ret += check6 ();
-      ret += check6d ();        /* with daemonization */
     }
   ret += check_start_stop ();