[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26374 - in gnunet: . src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26374 - in gnunet: . src/testbed |
Date: |
Mon, 11 Mar 2013 11:23:02 +0100 |
Author: harsha
Date: 2013-03-11 11:23:02 +0100 (Mon, 11 Mar 2013)
New Revision: 26374
Modified:
gnunet/configure.ac
gnunet/src/testbed/gnunet-service-testbed.c
Log:
- fix
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-03-11 08:18:17 UTC (rev 26373)
+++ gnunet/configure.ac 2013-03-11 10:23:02 UTC (rev 26374)
@@ -976,7 +976,8 @@
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])
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2013-03-11 08:18:17 UTC (rev
26373)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2013-03-11 10:23:02 UTC (rev
26374)
@@ -2004,6 +2004,7 @@
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 @@
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 !=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26374 - in gnunet: . src/testbed,
gnunet <=