[GNUnet-SVN] r11403 - gnunet/src/hostlist

[gnunet]

Author: wachs
Date: 2010-05-17 16:54:38 +0200 (Mon, 17 May 2010)
New Revision: 11403

Modified:
   gnunet/src/hostlist/gnunet-daemon-hostlist.c
   gnunet/src/hostlist/hostlist-server.c
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
Log:


Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-05-17 14:32:31 UTC 
(rev 11402)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-05-17 14:54:38 UTC 
(rev 11403)
@@ -234,7 +234,12 @@
 cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Hostlist daemon is shutting down\n");
+              "Hostlist daemon is shutting down\n");
+  if (core != NULL)
+    {
+      GNUNET_CORE_disconnect (core);
+      core = NULL;
+    }
   if (bootstrapping)
     {
       GNUNET_HOSTLIST_client_stop ();
@@ -245,11 +250,6 @@
       GNUNET_HOSTLIST_server_stop ();
     }
 #endif
-  if (core != NULL)
-    {
-      GNUNET_CORE_disconnect (core);
-      core = NULL;
-    }
   if (stats != NULL)
     {
       GNUNET_STATISTICS_destroy (stats,
@@ -259,12 +259,8 @@
   if (cfg != NULL)
     {
       GNUNET_CONFIGURATION_destroy(cfg);
+      cfg = NULL;
     }
-  if (tc->sched!=NULL)
-    {
-      GNUNET_SCHEDULER_shutdown (tc->sched);
-
-    }
 }
 
 /**

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-05-17 14:32:31 UTC (rev 
11402)
+++ gnunet/src/hostlist/hostlist-server.c       2010-05-17 14:54:38 UTC (rev 
11403)
@@ -738,6 +738,8 @@
     }
   cfg = NULL;
   sched = NULL;
+  stats = NULL;
+  core = NULL;
 }
 
 /* end of hostlist-server.c */

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-17 
14:32:31 UTC (rev 11402)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-17 
14:54:38 UTC (rev 11403)
@@ -50,6 +50,7 @@
 
 static char * current_adv_uri;
 
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 static struct GNUNET_SCHEDULER_Handle *sched;
 
 static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
@@ -445,7 +446,7 @@
      struct GNUNET_SCHEDULER_Handle *s,
      char *const *args,
      const char *cfgfile, 
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *c)
 {
   timeout = GNUNET_NO;
   adv_sent =GNUNET_NO;
@@ -454,6 +455,7 @@
   learned_hostlist_saved = GNUNET_NO;
   learned_hostlist_downloaded = GNUNET_NO;
 
+  cfg = c;
   sched = s;
 
   check_task = GNUNET_SCHEDULER_add_delayed (sched,