aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist/test_gnunet_daemon_hostlist_learning.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-05-17 11:12:18 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-05-17 11:12:18 +0000
commitfbe2962b84feab870f8de87b0211b5cf8ae25a6e (patch)
treecd00e6315cbffdf8703a49c06e694c7351fc3fcc /src/hostlist/test_gnunet_daemon_hostlist_learning.c
parent91c2e323571c48a676b7f9dcf348789e9fb08d40 (diff)
downloadgnunet-fbe2962b84feab870f8de87b0211b5cf8ae25a6e.tar.gz
gnunet-fbe2962b84feab870f8de87b0211b5cf8ae25a6e.zip
Diffstat (limited to 'src/hostlist/test_gnunet_daemon_hostlist_learning.c')
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_learning.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index db9ef6476..78c7f71f3 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -106,12 +106,8 @@ static void shutdown_testcase()
106 timeout_task); 106 timeout_task);
107 timeout_task = GNUNET_SCHEDULER_NO_TASK; 107 timeout_task = GNUNET_SCHEDULER_NO_TASK;
108 } 108 }
109 if (check_task != GNUNET_SCHEDULER_NO_TASK)
110 {
111 GNUNET_SCHEDULER_cancel (sched, check_task);
112 check_task = GNUNET_SCHEDULER_NO_TASK;
113 }
114 109
110 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Task.\n");
115 if ((NULL != learn_peer.stats) && (NULL != download_stats)) 111 if ((NULL != learn_peer.stats) && (NULL != download_stats))
116 GNUNET_STATISTICS_get_cancel (download_stats); 112 GNUNET_STATISTICS_get_cancel (download_stats);
117 if ((NULL != learn_peer.stats) && (NULL != urisrecv_stat)) 113 if ((NULL != learn_peer.stats) && (NULL != urisrecv_stat))
@@ -120,6 +116,15 @@ static void shutdown_testcase()
120 GNUNET_STATISTICS_get_cancel (advsent_stat); 116 GNUNET_STATISTICS_get_cancel (advsent_stat);
121 if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri); 117 if ( NULL != current_adv_uri ) GNUNET_free (current_adv_uri);
122 118
119
120 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping Statistics Check Task.\n");
121 if (check_task != GNUNET_SCHEDULER_NO_TASK)
122 {
123 GNUNET_SCHEDULER_cancel (sched, check_task);
124 check_task = GNUNET_SCHEDULER_NO_TASK;
125 }
126
127 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from Transport.\n");
123 if (adv_peer.th != NULL) 128 if (adv_peer.th != NULL)
124 { 129 {
125 GNUNET_TRANSPORT_disconnect (adv_peer.th); 130 GNUNET_TRANSPORT_disconnect (adv_peer.th);
@@ -130,6 +135,8 @@ static void shutdown_testcase()
130 GNUNET_TRANSPORT_disconnect (learn_peer.th); 135 GNUNET_TRANSPORT_disconnect (learn_peer.th);
131 learn_peer.th = NULL; 136 learn_peer.th = NULL;
132 } 137 }
138
139 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from Core.\n");
133 if (adv_peer.core != NULL) 140 if (adv_peer.core != NULL)
134 { 141 {
135 GNUNET_CORE_disconnect (adv_peer.core); 142 GNUNET_CORE_disconnect (adv_peer.core);