From 563b71afee70ac213a8bb28ce0697fcbae06aac3 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 5 Sep 2011 21:18:45 +0000 Subject: fixing API and clean up issues in testing --- src/fs/test_gnunet_service_fs_migration.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/fs/test_gnunet_service_fs_migration.c') diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c index a5570e1d4..bbf2534d2 100644 --- a/src/fs/test_gnunet_service_fs_migration.c +++ b/src/fs/test_gnunet_service_fs_migration.c @@ -52,12 +52,19 @@ static int ok; static struct GNUNET_TIME_Absolute start_time; +static struct GNUNET_FS_TEST_ConnectContext *cc; + static void do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_TIME_Relative del; char *fancy; - + + if (NULL != cc) + { + GNUNET_FS_TEST_daemons_connect_cancel (cc); + cc = NULL; + } GNUNET_FS_TEST_daemons_stop (2, daemons); if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) { @@ -138,6 +145,7 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri) static void do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + cc = NULL; if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) { GNUNET_FS_TEST_daemons_stop (2, daemons); @@ -165,8 +173,8 @@ do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemons started, will now try to connect them\n"); - GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT, &do_publish, - NULL); + cc = GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT, &do_publish, + NULL); } -- cgit v1.2.3