From 4ef5ef17a88923ddc570055fb5010dc2fcbfe5de Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 7 Nov 2011 09:31:01 +0000 Subject: [PATCH] fixing mantis 1878 --- src/transport/test_transport_api_disconnect.c | 8 +++++++- src/transport/transport-testing.c | 6 +++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/transport/test_transport_api_disconnect.c b/src/transport/test_transport_api_disconnect.c index f97c449fc..5e45e84b5 100644 --- a/src/transport/test_transport_api_disconnect.c +++ b/src/transport/test_transport_api_disconnect.c @@ -34,7 +34,7 @@ #include "transport.h" #include "transport-testing.h" -#define VERBOSE GNUNET_EXTRA_LOGGING +#define VERBOSE GNUNET_YES #define VERBOSE_ARM GNUNET_EXTRA_LOGGING #define START_ARM GNUNET_YES @@ -126,6 +126,12 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); + if (cc != NULL) + { + GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc); + cc = NULL; + } + if (send_task != GNUNET_SCHEDULER_NO_TASK) { GNUNET_SCHEDULER_cancel (send_task); diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c index b23879032..fc1eaf556 100644 --- a/src/transport/transport-testing.c +++ b/src/transport/transport-testing.c @@ -205,6 +205,10 @@ try_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) return; + GNUNET_assert (cc != NULL); + GNUNET_assert (cc->p1 != NULL); + GNUNET_assert (cc->p2 != NULL); + char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id)); GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", @@ -402,9 +406,9 @@ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", "Canceling connect request %X!\n", cc); + if (cc->tct != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (cc->tct); - cc->tct = GNUNET_SCHEDULER_NO_TASK; GNUNET_CONTAINER_DLL_remove (tth->cc_head, tth->cc_tail, cc); -- 2.25.1