diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-02 12:09:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-02 12:09:39 +0000 |
commit | 0ac0a301c63b5cb1fed345e620f9a106bcce9850 (patch) | |
tree | 6b786a52a4b1845f257ace68a7ea26d802149259 /src/fragmentation | |
parent | 89fcd331339e3bc2c0ce62a7765dac3f39cfff2a (diff) | |
download | gnunet-0ac0a301c63b5cb1fed345e620f9a106bcce9850.tar.gz gnunet-0ac0a301c63b5cb1fed345e620f9a106bcce9850.zip |
undo 17914, 915, 916
Diffstat (limited to 'src/fragmentation')
-rw-r--r-- | src/fragmentation/defragmentation.c | 2 | ||||
-rw-r--r-- | src/fragmentation/fragmentation.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index d080f54da..b07f20407 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c | |||
@@ -536,8 +536,6 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc, | |||
536 | { | 536 | { |
537 | delay = GNUNET_TIME_UNIT_ZERO; | 537 | delay = GNUNET_TIME_UNIT_ZERO; |
538 | } | 538 | } |
539 | if (NULL != getenv ("infinitebandwidth")) | ||
540 | delay = GNUNET_TIME_UNIT_ZERO; | ||
541 | if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task) | 539 | if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task) |
542 | GNUNET_SCHEDULER_cancel (mc->ack_task); | 540 | GNUNET_SCHEDULER_cancel (mc->ack_task); |
543 | mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc); | 541 | mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc); |
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index fc69b8a3a..ef3a57a87 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c | |||
@@ -160,8 +160,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
160 | delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize); | 160 | delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize); |
161 | else | 161 | else |
162 | delay = GNUNET_TIME_UNIT_ZERO; | 162 | delay = GNUNET_TIME_UNIT_ZERO; |
163 | if (NULL != getenv ("infinitebandwidth")) | ||
164 | delay = GNUNET_TIME_UNIT_ZERO; | ||
165 | if (delay.rel_value > 0) | 163 | if (delay.rel_value > 0) |
166 | { | 164 | { |
167 | fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc); | 165 | fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc); |
@@ -210,8 +208,6 @@ transmit_next (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
210 | fc->last_round = GNUNET_TIME_absolute_get (); | 208 | fc->last_round = GNUNET_TIME_absolute_get (); |
211 | fc->wack = GNUNET_YES; | 209 | fc->wack = GNUNET_YES; |
212 | } | 210 | } |
213 | if (NULL != getenv ("infinitebandwidth")) | ||
214 | delay = GNUNET_TIME_UNIT_ZERO; | ||
215 | fc->proc_busy = GNUNET_YES; | 211 | fc->proc_busy = GNUNET_YES; |
216 | fc->delay_until = GNUNET_TIME_relative_to_absolute (delay); | 212 | fc->delay_until = GNUNET_TIME_relative_to_absolute (delay); |
217 | fc->proc (fc->proc_cls, &fh->header); | 213 | fc->proc (fc->proc_cls, &fh->header); |