aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-03-11 10:23:02 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-03-11 10:23:02 +0000
commitdf1470e48a49d184b3ca60b7245a56fc970d07b3 (patch)
treebcd1d8387d2de4c02ec10f2fc05efdcf6ac01a66
parentd85f30806c7581c9da71b44e70a92c0ff6861aef (diff)
downloadgnunet-df1470e48a49d184b3ca60b7245a56fc970d07b3.tar.gz
gnunet-df1470e48a49d184b3ca60b7245a56fc970d07b3.zip
- fix
-rw-r--r--configure.ac3
-rw-r--r--src/testbed/gnunet-service-testbed.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 35d831032..e8ba3f61c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -976,7 +976,8 @@ AC_ARG_ENABLE([ll],
976 else 976 else
977 ll=1 977 ll=1
978 fi], 978 fi],
979 [ll=0]) 979 [ll=0
980 enable_ll=no])
980AC_MSG_RESULT($enable_ll) 981AC_MSG_RESULT($enable_ll)
981AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"]) 982AM_CONDITIONAL([ENABLE_LL], [test "x$ll" = "x1"])
982AC_DEFINE_UNQUOTED([ENABLE_LL], [$ll], [Build with LL support]) 983AC_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 2d4eab36c..e7e0a5d40 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,
2004 struct ForwardedOperationContext *fo_ctxt = cls; 2004 struct ForwardedOperationContext *fo_ctxt = cls;
2005 struct HandlerContext_ShutdownPeers *hc; 2005 struct HandlerContext_ShutdownPeers *hc;
2006 2006
2007 fo_ctxt->timeout_task = GNUNET_SCHEDULER_NO_TASK;
2007 hc = fo_ctxt->cls; 2008 hc = fo_ctxt->cls;
2008 hc->timeout = GNUNET_YES; 2009 hc->timeout = GNUNET_YES;
2009 GNUNET_assert (0 < hc->nslaves); 2010 GNUNET_assert (0 < hc->nslaves);
@@ -2034,6 +2035,9 @@ shutdown_peers_reply_cb (void *cls,
2034 struct HandlerContext_ShutdownPeers *hc; 2035 struct HandlerContext_ShutdownPeers *hc;
2035 2036
2036 hc = fo_ctxt->cls; 2037 hc = fo_ctxt->cls;
2038 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != fo_ctxt->timeout_task);
2039 GNUNET_SCHEDULER_cancel (fo_ctxt->timeout_task);
2040 fo_ctxt->timeout_task = GNUNET_SCHEDULER_NO_TASK;
2037 GNUNET_assert (0 < hc->nslaves); 2041 GNUNET_assert (0 < hc->nslaves);
2038 hc->nslaves--; 2042 hc->nslaves--;
2039 if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS != 2043 if (GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS !=