Merge branch 'master' of gnunet.org:gnunet

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e5109eff..1da6fa2cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Feb 28 19:07:59 CET 2019
+  CADET: Fix in order, unrealiable message ordering
+
 Thu 28 Feb 2019 10:54:58 AM CET
         Releasing GNUnet 0.11.0. -CG
 
diff --git a/contrib/benchmark/collect.awk b/contrib/benchmark/collect.awk
index c10191162..66bdf387e 100644
--- a/contrib/benchmark/collect.awk
+++ b/contrib/benchmark/collect.awk
@@ -94,8 +94,8 @@ END {
             "time_avg_us", avg(url[x][y]["time_us"], url[x][y]["count"]), \
             "stdev", stdev(url[x][y]["time_us"], url[x][y]["time_us_sq"], url[x][y]["count"]), \
             "time_us_max", url[x][y]["time_us_max"], \
-            "bytes_sent_avg", avg(url[x][y]["bytes_sent"], url[x][y]["count]), \
-            "bytes_received_avg", avg(url[x][y]["bytes_received"], url[x][y]["count]);
+            "bytes_sent_avg", avg(url[x][y]["bytes_sent"], url[x][y]["count"]), \
+            "bytes_received_avg", avg(url[x][y]["bytes_received"], url[x][y]["count"]);
     }
   }
   if (total_ops) {
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index 1746fc509..1e898c1eb 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) )
@@ -1422,7 +1425,7 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel *ch,
       ccc->client_ready = GNUNET_NO;
       GSC_send_to_client (ccc->c,
                           next_msg->env);
-      ch->mid_recv.mid = htonl (1 + ntohl (ch->mid_recv.mid));
+      ch->mid_recv.mid = htonl (1 + ntohl (next_msg->mid.mid));
       ch->mid_futures >>= 1;
       send_channel_data_ack (ch);
       GNUNET_CONTAINER_DLL_remove (ccc->head_recv,