[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: change Makefile.am back so
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: change Makefile.am back so it builds at least; fix #4908 in cadet API |
Date: |
Tue, 21 Feb 2017 17:45:56 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 89e606364 change Makefile.am back so it builds at least; fix #4908 in
cadet API
89e606364 is described below
commit 89e606364e4ccb77d6e6d8b0b7518c1749d90243
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Feb 21 17:47:06 2017 +0100
change Makefile.am back so it builds at least; fix #4908 in cadet API
---
src/cadet/Makefile.am | 4 ++--
src/cadet/cadet_api_new.c | 26 ++++++--------------------
src/include/gnunet_mq_lib.h | 2 +-
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am
index 6f38c6a94..74791d66e 100644
--- a/src/cadet/Makefile.am
+++ b/src/cadet/Makefile.am
@@ -149,12 +149,12 @@ ld_cadet_test_lib = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/testing/libgnunettesting.la \
libgnunetcadettest.a \
- libgnunetcadetnew.la \
+ libgnunetcadet.la \
$(top_builddir)/src/testbed/libgnunettestbed.la \
$(top_builddir)/src/statistics/libgnunetstatistics.la
dep_cadet_test_lib = \
- libgnunetcadetnew.la \
+ libgnunetcadet.la \
libgnunetcadettest.a \
$(top_builddir)/src/statistics/libgnunetstatistics.la
diff --git a/src/cadet/cadet_api_new.c b/src/cadet/cadet_api_new.c
index 81bfe1f6f..a62de0a47 100644
--- a/src/cadet/cadet_api_new.c
+++ b/src/cadet/cadet_api_new.c
@@ -442,22 +442,6 @@ notify_window_size (struct GNUNET_CADET_Channel *ch)
/**
- * Allow the MQ implementation to send the next message.
- *
- * @param cls Closure (channel whose mq to activate).
- */
-static void
-cadet_mq_send_continue (void *cls)
-{
- struct GNUNET_CADET_Channel *ch = cls;
-
- ch->mq_cont = NULL;
- GNUNET_assert (NULL == ch->pending_env);
- GNUNET_MQ_impl_send_continue (ch->mq);
-}
-
-
-/**
* Transmit the next message from our queue.
*
* @param cls Closure (channel whose mq to activate).
@@ -482,13 +466,10 @@ cadet_mq_send_now (void *cls)
return;
}
ch->allow_send--;
- GNUNET_MQ_impl_send_in_flight (ch->mq);
ch->pending_env = NULL;
- GNUNET_MQ_notify_sent (env,
- &cadet_mq_send_continue,
- ch);
GNUNET_MQ_send (ch->cadet->mq,
env);
+ GNUNET_MQ_impl_send_continue (ch->mq);
}
@@ -604,6 +585,11 @@ cadet_mq_cancel_impl (struct GNUNET_MQ_Handle *mq,
GNUNET_assert (NULL != ch->pending_env);
GNUNET_MQ_discard (ch->pending_env);
ch->pending_env = NULL;
+ if (NULL != ch->mq_cont)
+ {
+ GNUNET_SCHEDULER_cancel (ch->mq_cont);
+ ch->mq_cont = NULL;
+ }
}
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index a50a59c49..f9ad6c913 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -777,7 +777,7 @@ GNUNET_MQ_impl_send_continue (struct GNUNET_MQ_Handle *mq);
* try to send the next message until #gnunet_mq_impl_send_continue
* is called.
*
- * only useful for implementing message queues, results in undefined
+ * Only useful for implementing message queues, results in undefined
* behavior if not used carefully.
*
* @param mq message queue to send the next message with
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: change Makefile.am back so it builds at least; fix #4908 in cadet API,
gnunet <=