diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-02-16 16:28:08 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-02-16 16:28:08 +0000 |
commit | ffd3461b0e8f9ef299e40e8497efdfffdd1f0edd (patch) | |
tree | 476c3980b2250a19ebdaa16705152dfb9235c1a8 | |
parent | 6ba4e3ed384f9c3e5afd6595b6c0ca42be55f336 (diff) | |
download | gnunet-ffd3461b0e8f9ef299e40e8497efdfffdd1f0edd.tar.gz gnunet-ffd3461b0e8f9ef299e40e8497efdfffdd1f0edd.zip |
change testing to use is peer connected
-rw-r--r-- | src/testing/testing.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index fe6644aba..d0b0c1ee5 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1539,6 +1539,8 @@ connect_notify (void *cls, | |||
1539 | { | 1539 | { |
1540 | ctx->connected = GNUNET_YES; | 1540 | ctx->connected = GNUNET_YES; |
1541 | ctx->distance = 0; /* FIXME: distance */ | 1541 | ctx->distance = 0; /* FIXME: distance */ |
1542 | if (ctx->hello_send_task != GNUNET_SCHEDULER_NO_TASK) | ||
1543 | GNUNET_SCHEDULER_cancel(ctx->hello_send_task); | ||
1542 | GNUNET_SCHEDULER_cancel (ctx->timeout_task); | 1544 | GNUNET_SCHEDULER_cancel (ctx->timeout_task); |
1543 | ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result, | 1545 | ctx->timeout_task = GNUNET_SCHEDULER_add_now (¬ify_connect_result, |
1544 | ctx); | 1546 | ctx); |
@@ -1774,7 +1776,8 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, | |||
1774 | #endif | 1776 | #endif |
1775 | 1777 | ||
1776 | /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */ | 1778 | /* Core is up! Iterate over all _known_ peers first to check if we are already connected to the peer! */ |
1777 | GNUNET_CORE_iterate_peers(ctx->d1->cfg, &core_initial_iteration, ctx); | 1779 | GNUNET_CORE_is_peer_connected (ctx->d1->cfg, &ctx->d2->id, &core_initial_iteration, ctx); |
1780 | /* GNUNET_CORE_iterate_peers(ctx->d1->cfg, &core_initial_iteration, ctx); */ | ||
1778 | 1781 | ||
1779 | } | 1782 | } |
1780 | 1783 | ||