[GNUnet-SVN] [gnunet] branch master updated: add out-of-order pref

[gnunet]

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 a90f85878 add out-of-order pref
a90f85878 is described below

commit a90f8587871a66a71c802c2c8823c7a44d0f6d2c
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun May 5 11:14:20 2019 +0200

    add out-of-order pref
---
 src/include/gnunet_mq_lib.h | 7 ++++++-
 src/util/mq.c               | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 498567ec2..4fe5c8df9 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -291,7 +291,12 @@ enum GNUNET_MQ_PriorityPreferences
    * overall goodput.  It rarely makes sense to combine this flag with
    * #GNUNET_MQ_PREF_LOW_LATENCY.
    */
-  GNUNET_MQ_PREF_GOODPUT = 128
+  GNUNET_MQ_PREF_GOODPUT = 128,
+
+  /**
+   * Flag to indicate that out-of-order delivery is OK.
+   */
+  GNUNET_MQ_PREF_OUT_OF_ORDER = 256
 
 };
 
diff --git a/src/util/mq.c b/src/util/mq.c
index 2f9e650b6..c9cfad2bd 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -1050,6 +1050,8 @@ GNUNET_MQ_env_combine_options (enum 
GNUNET_MQ_PriorityPreferences p1,
   ret |=
     ((p1 & GNUNET_MQ_PREF_CORK_ALLOWED) & (p2 & GNUNET_MQ_PREF_CORK_ALLOWED));
   ret |= ((p1 & GNUNET_MQ_PREF_GOODPUT) & (p2 & GNUNET_MQ_PREF_GOODPUT));
+  ret |=
+    ((p1 & GNUNET_MQ_PREF_OUT_OF_ORDER) & (p2 & GNUNET_MQ_PREF_OUT_OF_ORDER));
   return ret;
 }
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden