diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/testbed/gnunet-service-testbed.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 35d8310327..e8ba3f61cd 100644 --- a/configure.ac +++ b/configure.ac @@ -976,7 +976,8 @@ AC_ARG_ENABLE([ll], else ll=1 fi], - [ll=0]) + [ll=0 + enable_ll=no]) AC_MSG_RESULT($enable_ll) AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"]) AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support]) diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 2d4eab36cf..e7e0a5d40d 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c @@ -2004,6 +2004,7 @@ shutdown_peers_timeout_cb (void *cls, struct ForwardedOperationContext *fo_ctxt = cls; struct HandlerContext_ShutdownPeers *hc; + fo_ctxt->timeout_task = GNUNET_SCHEDULER_NO_TASK; hc = fo_ctxt->cls; hc->timeout = GNUNET_YES; GNUNET_assert (0 < hc->nslaves); @@ -2034,6 +2035,9 @@ shutdown_peers_reply_cb (void *cls, struct HandlerContext_ShutdownPeers *hc; hc = fo_ctxt->cls; + GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != fo_ctxt->timeout_task); + GNUNET_SCHEDULER_cancel (fo_ctxt->timeout_task); + fo_ctxt->timeout_task = GNUNET_SCHEDULER_NO_TASK; GNUNET_assert (0 < hc->nslaves); hc->nslaves--; if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS != |