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

[gnunet]

Author: wachs
Date: 2010-05-17 16:32:31 +0200 (Mon, 17 May 2010)
New Revision: 11402

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 13:17:29 UTC 
(rev 11401)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.c        2010-05-17 14:32:31 UTC 
(rev 11402)
@@ -75,6 +75,11 @@
 static int learning;
 
 /**
+ * Our configuration.
+ */
+static const struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
  * Statistics handle.
  */
 static struct GNUNET_STATISTICS_Handle *stats;
@@ -251,6 +256,15 @@
                                 GNUNET_NO);
       stats = NULL;
     }
+  if (cfg != NULL)
+    {
+      GNUNET_CONFIGURATION_destroy(cfg);
+    }
+  if (tc->sched!=NULL)
+    {
+      GNUNET_SCHEDULER_shutdown (tc->sched);
+
+    }
 }
 
 /**
@@ -297,6 +311,9 @@
                  _("None of the functions for the hostlist daemon were 
enabled.  I have no reason to run!\n"));
       return;
     }
+
+
+
   stats = GNUNET_STATISTICS_create (sched, "hostlist", cfg);
 
   core = GNUNET_CORE_connect (sched, cfg,

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-05-17 13:17:29 UTC (rev 
11401)
+++ gnunet/src/hostlist/hostlist-server.c       2010-05-17 14:32:31 UTC (rev 
11402)
@@ -736,6 +736,8 @@
       GNUNET_PEERINFO_disconnect (peerinfo);
       peerinfo = NULL;
     }
+  cfg = NULL;
+  sched = 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 
13:17:29 UTC (rev 11401)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_learning.c  2010-05-17 
14:32:31 UTC (rev 11402)
@@ -160,9 +160,6 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Hostlist server ARM process %u stopped\n", adv_peer.arm_pid);
 #endif
-  /*
-  if (NULL != adv_peer.cfg)
-    GNUNET_CONFIGURATION_destroy (adv_peer.cfg);*/
   
 
 #if START_ARM
@@ -175,13 +172,16 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Hostlist client ARM process %u stopped\n", learn_peer.arm_pid);
 #endif
-  /*
+
   if (NULL != learn_peer.cfg)
-    GNUNET_CONFIGURATION_destroy (learn_peer.cfg);*/
+    GNUNET_CONFIGURATION_destroy (learn_peer.cfg);
+      if (NULL != adv_peer.cfg)
+    GNUNET_CONFIGURATION_destroy (adv_peer.cfg);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down scheduler\n");
   GNUNET_SCHEDULER_shutdown (sched);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutdown complete....\n");
+
 }
 
 /**