aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist/test_gnunet_daemon_hostlist_learning.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-04-26 15:31:07 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-04-26 15:31:07 +0000
commit97c255a2ec844e63cd116f6e804b629185302e85 (patch)
treeeb3691ce52e5438fe3d1127415efe741533bc6fe /src/hostlist/test_gnunet_daemon_hostlist_learning.c
parente6674963348824eb7d8bdfdc0e2d655ca9773a40 (diff)
downloadgnunet-97c255a2ec844e63cd116f6e804b629185302e85.tar.gz
gnunet-97c255a2ec844e63cd116f6e804b629185302e85.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, 17 insertions, 0 deletions
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index b529eb86d..8f457fa1e 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -71,6 +71,8 @@ static struct PeerContext adv_peer;
71 71
72static struct PeerContext learn_peer; 72static struct PeerContext learn_peer;
73 73
74static struct PeerContext learn_peer2;
75
74 76
75static void 77static void
76waitpid_task (void *cls, 78waitpid_task (void *cls,
@@ -137,6 +139,11 @@ static void shutdown_testcase()
137 GNUNET_TRANSPORT_disconnect (learn_peer.th); 139 GNUNET_TRANSPORT_disconnect (learn_peer.th);
138 learn_peer.th = NULL; 140 learn_peer.th = NULL;
139 } 141 }
142 if (learn_peer2.th != NULL)
143 {
144 GNUNET_TRANSPORT_disconnect (learn_peer2.th);
145 learn_peer2.th = NULL;
146 }
140 if (adv_peer.core != NULL) 147 if (adv_peer.core != NULL)
141 { 148 {
142 GNUNET_CORE_disconnect (adv_peer.core); 149 GNUNET_CORE_disconnect (adv_peer.core);
@@ -147,11 +154,19 @@ static void shutdown_testcase()
147 GNUNET_CORE_disconnect (learn_peer.core); 154 GNUNET_CORE_disconnect (learn_peer.core);
148 learn_peer.core = NULL; 155 learn_peer.core = NULL;
149 } 156 }
157 if (learn_peer2.core != NULL)
158 {
159 GNUNET_CORE_disconnect (learn_peer2.core);
160 learn_peer2.core = NULL;
161 }
150 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 162 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
151 "Asking ARM to stop core services\n"); 163 "Asking ARM to stop core services\n");
152 learn_peer.arm = GNUNET_ARM_connect (learn_peer.cfg, sched, NULL); 164 learn_peer.arm = GNUNET_ARM_connect (learn_peer.cfg, sched, NULL);
153 GNUNET_ARM_stop_service (learn_peer.arm, "core", GNUNET_TIME_UNIT_SECONDS, 165 GNUNET_ARM_stop_service (learn_peer.arm, "core", GNUNET_TIME_UNIT_SECONDS,
154 &stop_cb, &learn_peer); 166 &stop_cb, &learn_peer);
167 learn_peer2.arm = GNUNET_ARM_connect (learn_peer2.cfg, sched, NULL);
168 GNUNET_ARM_stop_service (learn_peer2.arm, "core", GNUNET_TIME_UNIT_SECONDS,
169 &stop_cb, &learn_peer2);
155 adv_peer.arm = GNUNET_ARM_connect (adv_peer.cfg, sched, NULL); 170 adv_peer.arm = GNUNET_ARM_connect (adv_peer.cfg, sched, NULL);
156 GNUNET_ARM_stop_service (adv_peer.arm, "core", GNUNET_TIME_UNIT_SECONDS, 171 GNUNET_ARM_stop_service (adv_peer.arm, "core", GNUNET_TIME_UNIT_SECONDS,
157 &stop_cb, &adv_peer); 172 &stop_cb, &adv_peer);
@@ -415,6 +430,8 @@ run (void *cls,
415 430
416 setup_adv_peer (&adv_peer, "test_learning_adv_peer.conf"); 431 setup_adv_peer (&adv_peer, "test_learning_adv_peer.conf");
417 setup_learn_peer (&learn_peer, "test_learning_learn_peer.conf"); 432 setup_learn_peer (&learn_peer, "test_learning_learn_peer.conf");
433 setup_learn_peer (&learn_peer2, "test_learning_learn_peer2.conf");
434
418} 435}
419 436
420 437