MQ: Send prior enqueued message if queue is busy during send call

Signed-off-by: Jacki <jacki@thejackimonster.de>

1 files changed, 19 insertions, 3 deletions

diff --git a/src/lib/util/mq.c b/src/lib/util/mq.c
index 18ec3deda..c2ca5a1b8 100644
--- a/src/lib/util/mq.c
+++ b/src/lib/util/mq.c
@@ -296,6 +296,7 @@ GNUNET_MQ_get_length (struct GNUNET_MQ_Handle *mq)
   {
     return mq->queue_length;
   }
+  GNUNET_assert (0 < mq->queue_length);
   return mq->queue_length - 1;
 }
 
@@ -318,15 +319,24 @@ GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
   }
   ev->parent_queue = mq;
   /* is the implementation busy? queue it! */
-  if ((NULL != mq->current_envelope) || (NULL != mq->send_task) ||
-      (NULL != mq->envelope_head))
+  if ((NULL != mq->current_envelope) || (NULL != mq->send_task))
   {
     GNUNET_CONTAINER_DLL_insert_tail (mq->envelope_head,
                                       mq->envelope_tail,
                                       ev);
     return;
   }
-  GNUNET_assert (NULL == mq->envelope_head);
+  else if (NULL != mq->envelope_head)
+  {
+    GNUNET_CONTAINER_DLL_insert_tail (mq->envelope_head,
+                                      mq->envelope_tail,
+                                      ev);
+    
+    ev = mq->envelope_head;
+    GNUNET_CONTAINER_DLL_remove (mq->envelope_head,
+                                 mq->envelope_tail,
+                                 ev);
+  }
   mq->current_envelope = ev;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -344,6 +354,9 @@ GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq,
 struct GNUNET_MQ_Envelope *
 GNUNET_MQ_unsent_head (struct GNUNET_MQ_Handle *mq)
 {
+  GNUNET_assert (0 < mq->queue_length);
+  GNUNET_assert (NULL != mq->envelope_head);
+  GNUNET_assert (NULL != mq->envelope_tail);
   struct GNUNET_MQ_Envelope *env;
 
   env = mq->envelope_head;
@@ -371,6 +384,7 @@ void
 GNUNET_MQ_send_copy (struct GNUNET_MQ_Handle *mq,
                      const struct GNUNET_MQ_Envelope *ev)
 {
+  GNUNET_assert (NULL != ev);
   struct GNUNET_MQ_Envelope *env;
   uint16_t msize;
 
@@ -395,6 +409,7 @@ static void
 impl_send_continue (void *cls)
 {
   struct GNUNET_MQ_Handle *mq = cls;
+  GNUNET_assert (NULL != mq->send_task);
 
   mq->send_task = NULL;
   /* call is only valid if we're actually currently sending
@@ -428,6 +443,7 @@ GNUNET_MQ_impl_send_continue (struct GNUNET_MQ_Handle *mq)
   mq->queue_length--;
   mq->in_flight = false;
   current_envelope = mq->current_envelope;
+  GNUNET_assert (NULL != current_envelope);
   current_envelope->parent_queue = NULL;
   mq->current_envelope = NULL;
   GNUNET_assert (NULL == mq->send_task);