changes

2 files changed, 17 insertions, 8 deletions

diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 3afb11560..67a9b303b 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -706,6 +706,10 @@ call_continuation (struct UDP_MessageWrapper *udpw, int result)
                                   "# bytes overhead transmitted via UDP",
                                   udpw->msg_size - udpw->payload_size, GNUNET_NO);
         }
+        GNUNET_STATISTICS_update (plugin->env->stats,
+                              "# bytes payload transmitted via UDP",
+                              udpw->payload_size, GNUNET_NO);
+
         udpw->cont (udpw->cont_cls, &udpw->session->target, result,
                     udpw->payload_size, udpw->msg_size);
     }
@@ -1782,18 +1786,24 @@ read_process_ack (struct Plugin *plugin,
     }
   }
 
+  GNUNET_STATISTICS_update (plugin->env->stats,
+                        "# bytes payload transmitted via UDP",
+                        s->frag_ctx->payload_size, GNUNET_NO);
+
+  if (s->frag_ctx->on_wire_size >= s->frag_ctx->payload_size)
+  {
+      GNUNET_STATISTICS_update (plugin->env->stats,
+                            "# bytes overhead transmitted via UDP",
+                            s->frag_ctx->on_wire_size - s->frag_ctx->payload_size, GNUNET_NO);
+  }
+
+
   if (s->frag_ctx->cont != NULL)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Calling continuation for fragmented message to `%s' with result %s\n",
         GNUNET_i2s (&s->target), "OK");
 
-    if (s->frag_ctx->on_wire_size >= s->frag_ctx->payload_size)
-    {
-        GNUNET_STATISTICS_update (plugin->env->stats,
-                              "# bytes overhead transmitted via UDP",
-                              s->frag_ctx->on_wire_size - s->frag_ctx->payload_size, GNUNET_NO);
-    }
     s->frag_ctx->cont (s->frag_ctx->cont_cls, &udp_ack->sender, GNUNET_OK,
                        s->frag_ctx->payload_size, s->frag_ctx->on_wire_size);
   }
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index a6496c973..49f82e66b 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -525,12 +525,11 @@ demultiplexer (void *cls, const struct GNUNET_MessageHeader *msg)
     if (n == NULL)
       break;
 
-    GNUNET_assert (0 == n->traffic_overhead);
     if (bytes_physical >= bytes_msg)
     {
         LOG (GNUNET_ERROR_TYPE_DEBUG, "Overhead for %u byte message: %u \n",
             bytes_msg, bytes_physical - bytes_msg);
-      n->traffic_overhead = bytes_physical - bytes_msg;
+      n->traffic_overhead += bytes_physical - bytes_msg;
     }
     GNUNET_break (GNUNET_NO == n->is_ready);
     n->is_ready = GNUNET_YES;