cancel task

2 files changed, 29 insertions, 13 deletions

diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c
index e2e64a717..ceb3415d5 100644
--- a/src/hostlist/gnunet-daemon-hostlist.c
+++ b/src/hostlist/gnunet-daemon-hostlist.c
@@ -22,6 +22,11 @@
  * @file hostlist/gnunet-daemon-hostlist.c
  * @brief code for bootstrapping via hostlist servers
  * @author Christian Grothoff
+ *
+ * TODO:
+ * - implement -a and -e switches (send P2P messages about our hostlist URL,
+ *   receive such messages and automatically update our hostlist URL config
+ *   value).
  */
 
 #include <stdlib.h>
@@ -96,7 +101,7 @@ core_init (void *cls,
 {
   if (advertising && (NULL != server))
     {    
-      /* TODO: provide "server" to 'hostlist' module */
+      /* FIXME: provide "server" to 'hostlist' module */
     }
 }
 
@@ -150,8 +155,7 @@ run (void *cls,
   stats = GNUNET_STATISTICS_create (sched, "hostlist", cfg);
   if (learning)
     {
-      // FIXME!
-      // (register handler with core for hostlist ads)
+      /* FIXME (register handler with core for hostlist ads) */
     }
   if (bootstrapping)
     {
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c
index a481aa7a7..be0fa84df 100644
--- a/src/hostlist/hostlist-server.c
+++ b/src/hostlist/hostlist-server.c
@@ -51,6 +51,11 @@ static struct GNUNET_CONFIGURATION_Handle *cfg;
 static struct GNUNET_SCHEDULER_Handle *sched;
 
 /**
+ * Our primary task.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier hostlist_task;
+
+/**
  * Our canonical response.
  */
 static struct MHD_Response *response;
@@ -190,6 +195,10 @@ static void
 prepare_daemon (void);
 
 
+/**
+ * Call MHD to process pending requests and then go back
+ * and schedule the next run.
+ */
 static void
 run_daemon (void *cls,
             const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -229,16 +238,17 @@ prepare_daemon ()
     tv.value = (uint64_t) timeout;
   else
     tv = GNUNET_TIME_UNIT_FOREVER_REL;
-  GNUNET_SCHEDULER_add_select (sched,
-                               GNUNET_NO,
-                               GNUNET_SCHEDULER_PRIORITY_HIGH,
-                               GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
-                               tv,
-                               max,
-                               &rs,
-                               &ws,
-                               &run_daemon,
-                               NULL);
+  hostlist_task 
+    = GNUNET_SCHEDULER_add_select (sched,
+                                   GNUNET_NO,
+                                   GNUNET_SCHEDULER_PRIORITY_HIGH,
+                                   GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
+                                   tv,
+                                   max,
+                                   &rs,
+                                   &ws,
+                                   &run_daemon,
+                                   NULL);
 }
 
 
@@ -290,6 +300,8 @@ GNUNET_HOSTLIST_server_start (struct GNUNET_CONFIGURATION_Handle *c,
 void
 GNUNET_HOSTLIST_server_stop ()
 {
+  GNUNET_SCHEDULER_cancel (sched, hostlist_task);
+  hostlist_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK;
   MHD_stop_daemon (daemon_handle);
   daemon_handle = NULL;
 }