From c54b4152fc250351d968f472f0e9c14dcdfeb04e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 5 Oct 2011 13:45:47 +0000 Subject: [PATCH] cancel con_task --- src/core/test_core_api.c | 20 +++++++++++++++++++- src/core/test_core_quota_compliance.c | 1 + 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 5779b969d..771f08771 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c @@ -91,11 +91,22 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_assert (ok == 6); GNUNET_CORE_disconnect (p1.ch); + p1.ch = NULL; GNUNET_CORE_disconnect (p2.ch); + p2.ch = NULL; GNUNET_TRANSPORT_get_hello_cancel (p1.ghh); + p1.ghh = NULL; GNUNET_TRANSPORT_get_hello_cancel (p2.ghh); + p2.ghh = NULL; GNUNET_TRANSPORT_disconnect (p1.th); + p1.th = NULL; GNUNET_TRANSPORT_disconnect (p2.th); + p2.th = NULL; + if (GNUNET_SCHEDULER_NO_TASK != con_task) + { + GNUNET_SCHEDULER_cancel (con_task); + con_task = GNUNET_SCHEDULER_NO_TASK; + } ok = 0; } @@ -129,6 +140,11 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_TRANSPORT_disconnect (p2.th); p2.th = NULL; } + if (GNUNET_SCHEDULER_NO_TASK != con_task) + { + GNUNET_SCHEDULER_cancel (con_task); + con_task = GNUNET_SCHEDULER_NO_TASK; + } ok = 42; } @@ -259,11 +275,12 @@ connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &connect_task, NULL); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking core (1) to connect to peer `%4s'\n", + "Asking transport (1) to connect to peer `%4s'\n", GNUNET_i2s (&p2.id)); GNUNET_TRANSPORT_try_connect (p1.th, &p2.id); } + static void init_notify (void *cls, struct GNUNET_CORE_Handle *server, const struct GNUNET_PeerIdentity *my_identity, @@ -335,6 +352,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_YES, &outbound_notify, GNUNET_YES, handlers); } + static void stop_arm (struct PeerContext *p) { diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index f3e29c743..6f10635fe 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c @@ -535,6 +535,7 @@ init_notify (void *cls, struct GNUNET_CORE_Handle *server, GNUNET_i2s (&p2.id)); #endif GNUNET_TRANSPORT_try_connect (p1.th, &p2.id); + GNUNET_TRANSPORT_try_connect (p2.th, &p1.id); } } -- 2.25.1