[gnunet] branch master updated (a3b9d9876 -> 4402b568a)

[gnunet]

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

t3sserakt pushed a change to branch master
in repository gnunet.

    from a3b9d9876 Core: Fixed fragmentation logic.
     new 4254ee1a4 Core: Removed unnecessary client continue.
     new 1d88d6526 Transport: Added check for DV box, when checking for last 
applicable fragment during freeing some fragment.
     new 4402b568a Transport: Added logging to debug freeing of fragments.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/service/core/gnunet-service-core_kx.c        | 1 -
 src/service/transport/gnunet-service-transport.c | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/service/core/gnunet-service-core_kx.c 
b/src/service/core/gnunet-service-core_kx.c
index 4d970abbe..c5a1de769 100644
--- a/src/service/core/gnunet-service-core_kx.c
+++ b/src/service/core/gnunet-service-core_kx.c
@@ -885,7 +885,6 @@ handle_ephemeral_key (void *cls, const struct 
EphemeralKeyMessage *m)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "Duplicate EPHEMERAL_KEY from %s, do not verify\n",
                 GNUNET_i2s (&m->origin_identity));
-    GNUNET_TRANSPORT_core_receive_continue (transport, kx->peer);
     do_verify = GNUNET_NO;
   }
   if (0 != memcmp (&m->origin_identity,
diff --git a/src/service/transport/gnunet-service-transport.c 
b/src/service/transport/gnunet-service-transport.c
index 8c5de96ec..2d892a3d9 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -6643,6 +6643,12 @@ completed_pending_message (struct PendingMessage *pm)
     pos = pm->frag_parent;
     GNUNET_CONTAINER_MDLL_remove (frag, pos->head_frag, pos->tail_frag, pm);
     free_pending_message (pm);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "pos frag_off %lu pos bytes_msg %lu pmt %u parent %u\n",
+                pos->frag_off,
+                pos->bytes_msg,
+                pos->pmt,
+                NULL == pos->frag_parent ? 1 : 0);
     /* check if subtree is done */
     while ((NULL == pos->head_frag) && (pos->frag_off == (pos->bytes_msg
                                                           - sizeof(struct
@@ -6667,7 +6673,7 @@ completed_pending_message (struct PendingMessage *pm)
     }
 
     /* Was this the last applicable fragment? */
-    if ((NULL == pos->head_frag) && (NULL == pos->frag_parent) &&
+    if ((NULL == pos->head_frag) && (NULL == pos->frag_parent || PMT_DV_BOX == 
pos->pmt) &&
         (pos->frag_off == pos->bytes_msg))
       client_send_response (pos);
     return;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.