diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-05-17 14:54:38 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-05-17 14:54:38 +0000 |
commit | 13d76ea47923d76602da64b22264ba5a4c598209 (patch) | |
tree | 8c625e14cf45bb0f53b0f05cab9e3371b7b7b1d2 | |
parent | e95c25e12c6f8693c400ba7272317628a0c79ef2 (diff) | |
download | gnunet-13d76ea47923d76602da64b22264ba5a4c598209.tar.gz gnunet-13d76ea47923d76602da64b22264ba5a4c598209.zip |
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist.c | 18 | ||||
-rw-r--r-- | src/hostlist/hostlist-server.c | 2 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_learning.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index f25e4f6ca..cf0f646ed 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c | |||
@@ -234,7 +234,12 @@ static void | |||
234 | cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 234 | cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
235 | { | 235 | { |
236 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 236 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
237 | "Hostlist daemon is shutting down\n"); | 237 | "Hostlist daemon is shutting down\n"); |
238 | if (core != NULL) | ||
239 | { | ||
240 | GNUNET_CORE_disconnect (core); | ||
241 | core = NULL; | ||
242 | } | ||
238 | if (bootstrapping) | 243 | if (bootstrapping) |
239 | { | 244 | { |
240 | GNUNET_HOSTLIST_client_stop (); | 245 | GNUNET_HOSTLIST_client_stop (); |
@@ -245,11 +250,6 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
245 | GNUNET_HOSTLIST_server_stop (); | 250 | GNUNET_HOSTLIST_server_stop (); |
246 | } | 251 | } |
247 | #endif | 252 | #endif |
248 | if (core != NULL) | ||
249 | { | ||
250 | GNUNET_CORE_disconnect (core); | ||
251 | core = NULL; | ||
252 | } | ||
253 | if (stats != NULL) | 253 | if (stats != NULL) |
254 | { | 254 | { |
255 | GNUNET_STATISTICS_destroy (stats, | 255 | GNUNET_STATISTICS_destroy (stats, |
@@ -259,11 +259,7 @@ cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
259 | if (cfg != NULL) | 259 | if (cfg != NULL) |
260 | { | 260 | { |
261 | GNUNET_CONFIGURATION_destroy(cfg); | 261 | GNUNET_CONFIGURATION_destroy(cfg); |
262 | } | 262 | cfg = NULL; |
263 | if (tc->sched!=NULL) | ||
264 | { | ||
265 | GNUNET_SCHEDULER_shutdown (tc->sched); | ||
266 | |||
267 | } | 263 | } |
268 | } | 264 | } |
269 | 265 | ||
diff --git a/src/hostlist/hostlist-server.c b/src/hostlist/hostlist-server.c index 53f2470a7..055c90bab 100644 --- a/src/hostlist/hostlist-server.c +++ b/src/hostlist/hostlist-server.c | |||
@@ -738,6 +738,8 @@ GNUNET_HOSTLIST_server_stop () | |||
738 | } | 738 | } |
739 | cfg = NULL; | 739 | cfg = NULL; |
740 | sched = NULL; | 740 | sched = NULL; |
741 | stats = NULL; | ||
742 | core = NULL; | ||
741 | } | 743 | } |
742 | 744 | ||
743 | /* end of hostlist-server.c */ | 745 | /* end of hostlist-server.c */ |
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c index c08af48fb..799c99cb6 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c +++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c | |||
@@ -50,6 +50,7 @@ static int learned_hostlist_downloaded; | |||
50 | 50 | ||
51 | static char * current_adv_uri; | 51 | static char * current_adv_uri; |
52 | 52 | ||
53 | static struct GNUNET_CONFIGURATION_Handle *cfg; | ||
53 | static struct GNUNET_SCHEDULER_Handle *sched; | 54 | static struct GNUNET_SCHEDULER_Handle *sched; |
54 | 55 | ||
55 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; | 56 | static GNUNET_SCHEDULER_TaskIdentifier timeout_task; |
@@ -445,7 +446,7 @@ run (void *cls, | |||
445 | struct GNUNET_SCHEDULER_Handle *s, | 446 | struct GNUNET_SCHEDULER_Handle *s, |
446 | char *const *args, | 447 | char *const *args, |
447 | const char *cfgfile, | 448 | const char *cfgfile, |
448 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 449 | const struct GNUNET_CONFIGURATION_Handle *c) |
449 | { | 450 | { |
450 | timeout = GNUNET_NO; | 451 | timeout = GNUNET_NO; |
451 | adv_sent =GNUNET_NO; | 452 | adv_sent =GNUNET_NO; |
@@ -454,6 +455,7 @@ run (void *cls, | |||
454 | learned_hostlist_saved = GNUNET_NO; | 455 | learned_hostlist_saved = GNUNET_NO; |
455 | learned_hostlist_downloaded = GNUNET_NO; | 456 | learned_hostlist_downloaded = GNUNET_NO; |
456 | 457 | ||
458 | cfg = c; | ||
457 | sched = s; | 459 | sched = s; |
458 | 460 | ||
459 | check_task = GNUNET_SCHEDULER_add_delayed (sched, | 461 | check_task = GNUNET_SCHEDULER_add_delayed (sched, |