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

[gnunet]

Author: grothoff
Date: 2012-10-23 14:59:36 +0200 (Tue, 23 Oct 2012)
New Revision: 24473

Modified:
   gnunet/src/fragmentation/fragmentation.c
Log:
-hopefully fixing #2596

Modified: gnunet/src/fragmentation/fragmentation.c
===================================================================
--- gnunet/src/fragmentation/fragmentation.c    2012-10-23 12:37:30 UTC (rev 
24472)
+++ gnunet/src/fragmentation/fragmentation.c    2012-10-23 12:59:36 UTC (rev 
24473)
@@ -223,7 +223,8 @@
   else
     delay = GNUNET_TIME_UNIT_ZERO;
   delay = GNUNET_TIME_relative_max (delay,
-                                   fc->msg_delay);
+                                   GNUNET_TIME_relative_multiply 
(fc->msg_delay,
+                                                                  (1 << 
fc->num_rounds)));
   if (wrap)
   {
     /* full round transmitted wait 2x delay for ACK before going again */
@@ -462,7 +463,8 @@
   if (NULL != ack_delay)
     *ack_delay = fc->ack_delay;
   if (NULL != msg_delay)
-    *msg_delay = fc->msg_delay;
+    *msg_delay = GNUNET_TIME_relative_multiply (fc->msg_delay,
+                                               fc->num_rounds);
   GNUNET_free (fc);
 }