Smallers steps to keep plugin running

[oweals/gnunet.git] / src / hostlist / test_gnunet_daemon_hostlist.c

diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index 9e808fc58790194d930043969a76a3c37a717f5d..899a2eb44fca6b7313303da755ef5d960d5e8170 100644 (file)
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.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
@@ -48,7 +48,6 @@ struct PeerContext
   struct GNUNET_CONFIGURATION_Handle *cfg;
   struct GNUNET_TRANSPORT_Handle *th;
   struct GNUNET_MessageHeader *hello;
-  struct GNUNET_ARM_Handle *arm;
 #if START_ARM
   pid_t arm_pid;
 #endif
@@ -128,7 +127,6 @@ process_hello (void *cls,
   GNUNET_TRANSPORT_get_hello_cancel (p->th, &process_hello, p);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Received HELLO, starting hostlist service.\n");
-  GNUNET_ARM_start_services (p->cfg, sched, "hostlist", NULL);
 }
 
 
@@ -145,8 +143,7 @@ setup_peer (struct PeerContext *p, const char *cfgname)
                                         "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-  GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
-  p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, p, NULL, 
+  p->th = GNUNET_TRANSPORT_connect (sched, p->cfg, NULL, p, NULL, 
                                    &notify_connect, NULL);
   GNUNET_assert (p->th != NULL);
   GNUNET_TRANSPORT_get_hello (p->th, &process_hello, p);
@@ -174,35 +171,16 @@ waitpid_task (void *cls,
 
 
 static void
-stop_cb (void *cls, 
-        int success)
+stop_arm (struct PeerContext *p)
 {
-  struct PeerContext *p = cls;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             success 
-             ? "ARM stopped core service\n" 
-             : "ARM failed to stop core service\n");
-  GNUNET_ARM_disconnect (p->arm);
-  p->arm = NULL;
-  /* make sure this runs after all other tasks are done */
+             "Asking ARM to stop core service\n");
   GNUNET_SCHEDULER_add_delayed (sched,
                                GNUNET_TIME_UNIT_SECONDS,
                                &waitpid_task, p);
 }
 
 
-static void
-stop_arm (struct PeerContext *p)
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Asking ARM to stop core service\n");
-  p->arm = GNUNET_ARM_connect (p->cfg, sched, NULL);
-  GNUNET_ARM_stop_service (p->arm, "core", GNUNET_TIME_UNIT_SECONDS,
-                          &stop_cb, p);
-}
-
-
 /**
  * Try again to connect to transport service.
  */
@@ -225,8 +203,7 @@ run (void *cls,
   ok++;
   sched = s;
   timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
-                                              GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                                                             15),
+                                              TIMEOUT,
                                               &timeout_error,
                                               NULL);
   GNUNET_SCHEDULER_add_delayed (sched,