[GNUnet-SVN] r23366 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-08-22 20:44:55 +0200 (Wed, 22 Aug 2012)
New Revision: 23366

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- fix peer fwd ack gathering

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-08-22 15:55:51 UTC (rev 
23365)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-08-22 18:44:55 UTC (rev 
23366)
@@ -3437,6 +3437,7 @@
   cinfo = tunnel_get_neighbor_fc (t, &peer_id);
   ack = cinfo->fwd_ack;
 
+  ctx->nchildren++;
   if (GNUNET_NO == ctx->init)
   {
     ctx->max_child_ack = ack;
@@ -3474,7 +3475,11 @@
   tree_iterate_children (t->tree, tunnel_get_child_fwd_ack, &ctx);
 
   if (0 == ctx.nchildren)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+            "  tunnel has no children, no FWD ACK\n");
     return -1LL;
+  }
 
   if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ctx.max_child_ack, 
t->fwd_pid))
     ctx.max_child_ack = t->fwd_pid + 1; // Might overflow, it's ok.
@@ -3524,7 +3529,11 @@
   int64_t ack;
 
   if (0 == t->nclients)
-    return -1;
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "  tunnel has no clients, no FWD ACK\n");
+    return -1LL;
+  }
 
   for (ack = -1, i = 0; i < t->nclients; i++)
   {
@@ -4399,7 +4408,9 @@
     if (GNUNET_MESSAGE_TYPE_MESH_UNICAST == queue->type)
     {
       t->fwd_queue_n--;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*********   unicast: %u\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "*********   unicast: %u\n",
+                  t->fwd_queue_n);
     }
     else if (GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN == queue->type)
     {