aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-11-19 14:44:50 +0000
committerNathan S. Evans <evans@in.tum.de>2010-11-19 14:44:50 +0000
commitfad9bac338a30a26720bf032f29d7761544dad8f (patch)
tree34e7080830c2202219c08c3bd0d1a9f8e5ee0aba
parent6322fccba925caa0cc1b35b9f2315362217a212b (diff)
downloadgnunet-fad9bac338a30a26720bf032f29d7761544dad8f.tar.gz
gnunet-fad9bac338a30a26720bf032f29d7761544dad8f.zip
possible fix for timing issue (causing missed peer connect events) in testing
-rw-r--r--src/testing/testing.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 719903147..0204f311b 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -1412,6 +1412,7 @@ notify_connect_result (void *cls,
1412 GNUNET_CORE_disconnect (ctx->d1core); 1412 GNUNET_CORE_disconnect (ctx->d1core);
1413 ctx->d1core = NULL; 1413 ctx->d1core = NULL;
1414 } 1414 }
1415 ctx->d1core_ready = GNUNET_NO;
1415#if CONNECT_CORE2 1416#if CONNECT_CORE2
1416 if (ctx->d2core != NULL) 1417 if (ctx->d2core != NULL)
1417 { 1418 {
@@ -1696,14 +1697,10 @@ reattempt_daemons_connect (void *cls,
1696#endif 1697#endif
1697 1698
1698 GNUNET_assert (ctx->d1core == NULL); 1699 GNUNET_assert (ctx->d1core == NULL);
1699 1700 ctx->d1core_ready = GNUNET_NO;
1700 ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, 1, 1701 ctx->d1core = GNUNET_CORE_connect (ctx->d1->cfg, 1,
1701#if NO_MORE_TIMEOUT_FIXME
1702 GNUNET_TIME_absolute_get_remaining
1703 (ctx->timeout),
1704#endif
1705 ctx, 1702 ctx,
1706 NULL, 1703 &core_init_notify,
1707 &connect_notify, NULL, NULL, 1704 &connect_notify, NULL, NULL,
1708 NULL, GNUNET_NO, 1705 NULL, GNUNET_NO,
1709 NULL, GNUNET_NO, no_handlers); 1706 NULL, GNUNET_NO, no_handlers);