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

[gnunet]

Author: bartpolot
Date: 2013-07-18 15:54:19 +0200 (Thu, 18 Jul 2013)
New Revision: 28170

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- fix condition to omit hop-by-hop ACK

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-18 13:51:05 UTC (rev 
28169)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-18 13:54:19 UTC (rev 
28170)
@@ -312,7 +312,7 @@
   uint32_t                      mid;
 
     /**
-     * When was this message issued (to calculate ACK delay) FIXME update with 
traffic
+     * When was this message issued (to calculate ACK delay)
      */
   struct GNUNET_TIME_Absolute   timestamp;
 
@@ -365,7 +365,7 @@
   struct GNUNET_TIME_Relative       retry_timer;
 
     /**
-     * How long does it usually take to get an ACK. FIXME update with traffic
+     * How long does it usually take to get an ACK.
      */
   struct GNUNET_TIME_Relative       expected_delay;
 };
@@ -1310,7 +1310,7 @@
       }
     }
 #endif
-    GNUNET_break (0); // FIXME sometimes fails (testing disconnect?)
+    GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                     " no direct connection to %s\n",
                     GNUNET_i2s (&id));
@@ -2200,18 +2200,13 @@
   }
 
   /* Check if we need to transmit the ACK */
-  /* FIXME unlock */
-  if (0 && NULL == o && 
-      t->queue_max > next_fc->queue_n * 4 &&
-      GMC_is_pid_bigger (prev_fc->last_ack_sent, prev_fc->last_pid_recv) &&
+  if (NULL == o &&
+      prev_fc->last_ack_sent - prev_fc->last_pid_recv > 3 &&
       GNUNET_NO == t->force_ack)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Not sending ACK, buffer free\n");
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "  t->qmax: %u, t->qn: %u\n",
-                t->queue_max, next_fc->queue_n);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "  t->pid: %u, t->ack: %u\n",
+                "  last pid recv: %u, last ack sent: %u\n",
                 prev_fc->last_pid_recv, prev_fc->last_ack_sent);
     return;
   }