[GNUnet-SVN] [gnunet] branch master updated: check for ACKed MID

[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 04a3eab73 check for ACKed MID
04a3eab73 is described below

commit 04a3eab73f8fdeb520ace483b46c636cc7107cd3
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Feb 26 19:12:08 2019 +0100

    check for ACKed MID
---
 src/cadet/gnunet-service-cadet_channel.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cadet/gnunet-service-cadet_channel.c 
b/src/cadet/gnunet-service-cadet_channel.c
index 031da9e4d..905211e00 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -1318,6 +1318,7 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel 
*ch,
          ((msg->mid.mid == ch->mid_recv.mid) &&
           (GNUNET_YES == ch->reliable)) ||
          ((GNUNET_NO == ch->reliable) &&
+          (msg->mid.mid >= ch->mid_recv.mid) &&
           ((NULL == ccc->head_recv) ||
            (msg->mid.mid < ccc->head_recv->mid.mid))) )
     {
@@ -1416,11 +1417,12 @@ GCCH_handle_channel_plaintext_data (struct CadetChannel 
*ch,
                                    next_msg);
       ccc->num_recv--;
       /* Do not process duplicate MID */
-      if (msg->mid.mid == next_msg->mid.mid)
+      if ((msg->mid.mid == next_msg->mid.mid) || /* Duplicate */
+          (msg->mid.mid < ch->mid_recv.mid)) /* Old */
       {
         /* Duplicate within the queue, drop */
         LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Duplicate message on %s (mid %u) dropped\n",
+             "Message on %s (mid %u) dropped\n",
              GCCH_2s (ch),
              ntohl (msg->mid.mid));
         GNUNET_free (next_msg);

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