[GNUnet-SVN] [gnunet] branch master updated: prevent unordered message delivery

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new faf5ac192 prevent unordered message delivery
faf5ac192 is described below

commit faf5ac19261f7e3875deac5fdcd773c41dd048e2
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Feb 28 19:06:22 2019 +0100

    prevent unordered message delivery
---
 src/cadet/gnunet-service-cadet_channel.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cadet/gnunet-service-cadet_channel.c 
b/src/cadet/gnunet-service-cadet_channel.c
index 1746fc509..3c83d0bb3 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -1331,7 +1331,10 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel 
*ch,
       ccc->client_ready = GNUNET_NO;
       GSC_send_to_client (ccc->c,
                           env);
-      ch->mid_recv.mid = htonl (1 + ntohl (ch->mid_recv.mid));
+      if (GNUNET_NO == ch->out_of_order)
+        ch->mid_recv.mid = htonl (1 + ntohl (msg->mid.mid));
+      else
+        ch->mid_recv.mid = htonl (1 + ntohl (ch->mid_recv.mid));
       ch->mid_futures >>= 1;
       if ( (GNUNET_YES == ch->out_of_order) &&
           (GNUNET_NO == ch->reliable) )

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