diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-07 09:31:01 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-11-07 09:31:01 +0000 |
commit | 4ef5ef17a88923ddc570055fb5010dc2fcbfe5de (patch) | |
tree | d83a28f38b28fcfcefbbcbda0bd48e0f6c8c8e64 /src/transport | |
parent | 8f8f854083efb0791471067b377b5ed861eadca7 (diff) | |
download | gnunet-4ef5ef17a88923ddc570055fb5010dc2fcbfe5de.tar.gz gnunet-4ef5ef17a88923ddc570055fb5010dc2fcbfe5de.zip |
fixing mantis 1878
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/test_transport_api_disconnect.c | 8 | ||||
-rw-r--r-- | 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 @@ | |||
34 | #include "transport.h" | 34 | #include "transport.h" |
35 | #include "transport-testing.h" | 35 | #include "transport-testing.h" |
36 | 36 | ||
37 | #define VERBOSE GNUNET_EXTRA_LOGGING | 37 | #define VERBOSE GNUNET_YES |
38 | #define VERBOSE_ARM GNUNET_EXTRA_LOGGING | 38 | #define VERBOSE_ARM GNUNET_EXTRA_LOGGING |
39 | 39 | ||
40 | #define START_ARM GNUNET_YES | 40 | #define START_ARM GNUNET_YES |
@@ -126,6 +126,12 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
126 | 126 | ||
127 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); | 127 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n"); |
128 | 128 | ||
129 | if (cc != NULL) | ||
130 | { | ||
131 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel(tth, cc); | ||
132 | cc = NULL; | ||
133 | } | ||
134 | |||
129 | if (send_task != GNUNET_SCHEDULER_NO_TASK) | 135 | if (send_task != GNUNET_SCHEDULER_NO_TASK) |
130 | { | 136 | { |
131 | GNUNET_SCHEDULER_cancel (send_task); | 137 | 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) | |||
205 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) | 205 | if ((tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN) != 0) |
206 | return; | 206 | return; |
207 | 207 | ||
208 | GNUNET_assert (cc != NULL); | ||
209 | GNUNET_assert (cc->p1 != NULL); | ||
210 | GNUNET_assert (cc->p2 != NULL); | ||
211 | |||
208 | char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id)); | 212 | char *p2_s = GNUNET_strdup (GNUNET_i2s (&p2->id)); |
209 | 213 | ||
210 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", | 214 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", |
@@ -402,9 +406,9 @@ GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct | |||
402 | 406 | ||
403 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", | 407 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-testing", |
404 | "Canceling connect request %X!\n", cc); | 408 | "Canceling connect request %X!\n", cc); |
409 | |||
405 | if (cc->tct != GNUNET_SCHEDULER_NO_TASK) | 410 | if (cc->tct != GNUNET_SCHEDULER_NO_TASK) |
406 | GNUNET_SCHEDULER_cancel (cc->tct); | 411 | GNUNET_SCHEDULER_cancel (cc->tct); |
407 | |||
408 | cc->tct = GNUNET_SCHEDULER_NO_TASK; | 412 | cc->tct = GNUNET_SCHEDULER_NO_TASK; |
409 | 413 | ||
410 | GNUNET_CONTAINER_DLL_remove (tth->cc_head, tth->cc_tail, cc); | 414 | GNUNET_CONTAINER_DLL_remove (tth->cc_head, tth->cc_tail, cc); |