prevent unordered message delivery

diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 1746fc509aef859ac7ce50e5ea5c39d94a92ccab..3c83d0bb33419012cc3d6b50fdf9993b726b9d25 100644 (file)
--- 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) )