[GNUnet-SVN] r18187 - gnunet/src/fragmentation

[gnunet]

Author: grothoff
Date: 2011-11-17 15:54:42 +0100 (Thu, 17 Nov 2011)
New Revision: 18187

Modified:
   gnunet/src/fragmentation/fragmentation.c
Log:
consider number of retransmissions for delay calculation

Modified: gnunet/src/fragmentation/fragmentation.c
===================================================================
--- gnunet/src/fragmentation/fragmentation.c    2011-11-17 14:53:08 UTC (rev 
18186)
+++ gnunet/src/fragmentation/fragmentation.c    2011-11-17 14:54:42 UTC (rev 
18187)
@@ -205,14 +205,14 @@
   if (wrap)
   {
     /* full round transmitted wait 2x delay for ACK before going again */
+    fc->num_rounds++;
     delay =
         GNUNET_TIME_relative_max (GNUNET_TIME_relative_multiply (delay, 2),
-                                  fc->delay);
+                                  GNUNET_TIME_relative_multiply (fc->delay, 
fc->num_rounds);
     /* never use zero, need some time for ACK always */
     delay = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_MILLISECONDS, delay);
     fc->last_round = GNUNET_TIME_absolute_get ();
     fc->wack = GNUNET_YES;
-    fc->num_rounds++;
   }
   fc->proc_busy = GNUNET_YES;
   fc->delay_until = GNUNET_TIME_relative_to_absolute (delay);