diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-04-24 13:20:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-04-24 13:20:37 +0000 |
commit | c7d9dd68323bf87df84f84955efdea88f330faad (patch) | |
tree | b6059165d66fe9bd7785165db22cd6a0b14aad70 /src/gns/test_gns_dht_threepeer.c | |
parent | 054520ef90f692998c1bba369abd78eb5d7b6a8b (diff) | |
download | gnunet-c7d9dd68323bf87df84f84955efdea88f330faad.tar.gz gnunet-c7d9dd68323bf87df84f84955efdea88f330faad.zip |
-fix
Diffstat (limited to 'src/gns/test_gns_dht_threepeer.c')
-rw-r--r-- | src/gns/test_gns_dht_threepeer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gns/test_gns_dht_threepeer.c b/src/gns/test_gns_dht_threepeer.c index 3bafae424..ed9600f5e 100644 --- a/src/gns/test_gns_dht_threepeer.c +++ b/src/gns/test_gns_dht_threepeer.c | |||
@@ -135,6 +135,7 @@ finish_testing (void *cls, const char *emsg) | |||
135 | static void | 135 | static void |
136 | end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 136 | end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
137 | { | 137 | { |
138 | die_task = GNUNET_SCHEDULER_NO_TASK; | ||
138 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &finish_testing, NULL); | 139 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &finish_testing, NULL); |
139 | } | 140 | } |
140 | 141 | ||
@@ -146,9 +147,10 @@ end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
146 | static void | 147 | static void |
147 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 148 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
148 | { | 149 | { |
150 | die_task = GNUNET_SCHEDULER_NO_TASK; | ||
149 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Failing test with error: `%s'!\n", | 151 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Failing test with error: `%s'!\n", |
150 | (char *) cls); | 152 | (char *) cls); |
151 | GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL); | 153 | die_task = GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL); |
152 | ok = 1; | 154 | ok = 1; |
153 | } | 155 | } |
154 | 156 | ||
@@ -188,6 +190,7 @@ on_lookup_result(void *cls, uint32_t rd_count, | |||
188 | } | 190 | } |
189 | GNUNET_GNS_disconnect(gh); | 191 | GNUNET_GNS_disconnect(gh); |
190 | GNUNET_SCHEDULER_cancel(die_task); | 192 | GNUNET_SCHEDULER_cancel(die_task); |
193 | die_task = GNUNET_SCHEDULER_NO_TASK; | ||
191 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &finish_testing, NULL); | 194 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &finish_testing, NULL); |
192 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down!\n"); | 195 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down!\n"); |
193 | 196 | ||
@@ -252,6 +255,7 @@ daemon_connected (void *cls, const struct GNUNET_PeerIdentity *first, | |||
252 | total_connections); | 255 | total_connections); |
253 | #endif | 256 | #endif |
254 | GNUNET_SCHEDULER_cancel (die_task); | 257 | GNUNET_SCHEDULER_cancel (die_task); |
258 | die_task = GNUNET_SCHEDULER_NO_TASK; | ||
255 | //die_task = | 259 | //die_task = |
256 | // GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, "from connect"); | 260 | // GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, "from connect"); |
257 | 261 | ||