diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-23 12:59:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-23 12:59:36 +0000 |
commit | 8ed31afd21b25cbd0940d977a559f3c861143756 (patch) | |
tree | 6901beed4f390d61c555a32727814980aea64a8b /src/fragmentation/fragmentation.c | |
parent | fe563bb573dcf697d9773ca44bdb2b7c27fa6826 (diff) | |
download | gnunet-8ed31afd21b25cbd0940d977a559f3c861143756.tar.gz gnunet-8ed31afd21b25cbd0940d977a559f3c861143756.zip |
-hopefully fixing #2596
Diffstat (limited to 'src/fragmentation/fragmentation.c')
-rw-r--r-- | src/fragmentation/fragmentation.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index 2d5cf2c8e..f859b32c7 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c | |||
@@ -223,7 +223,8 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
223 | else | 223 | else |
224 | delay = GNUNET_TIME_UNIT_ZERO; | 224 | delay = GNUNET_TIME_UNIT_ZERO; |
225 | delay = GNUNET_TIME_relative_max (delay, | 225 | delay = GNUNET_TIME_relative_max (delay, |
226 | fc->msg_delay); | 226 | GNUNET_TIME_relative_multiply (fc->msg_delay, |
227 | (1 << fc->num_rounds))); | ||
227 | if (wrap) | 228 | if (wrap) |
228 | { | 229 | { |
229 | /* full round transmitted wait 2x delay for ACK before going again */ | 230 | /* full round transmitted wait 2x delay for ACK before going again */ |
@@ -462,7 +463,8 @@ GNUNET_FRAGMENT_context_destroy (struct GNUNET_FRAGMENT_Context *fc, | |||
462 | if (NULL != ack_delay) | 463 | if (NULL != ack_delay) |
463 | *ack_delay = fc->ack_delay; | 464 | *ack_delay = fc->ack_delay; |
464 | if (NULL != msg_delay) | 465 | if (NULL != msg_delay) |
465 | *msg_delay = fc->msg_delay; | 466 | *msg_delay = GNUNET_TIME_relative_multiply (fc->msg_delay, |
467 | fc->num_rounds); | ||
466 | GNUNET_free (fc); | 468 | GNUNET_free (fc); |
467 | } | 469 | } |
468 | 470 | ||