diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-10-27 16:05:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-10-27 16:05:18 +0000 |
commit | a78cd64b8551f257091a59ac79ab0807305c535a (patch) | |
tree | c2901575323738ac55ccedff449ef900302eab90 /src/fragmentation | |
parent | 2aee8da94c5aee59e4ffe2ce4ac9f0c984c4d570 (diff) | |
download | gnunet-a78cd64b8551f257091a59ac79ab0807305c535a.tar.gz gnunet-a78cd64b8551f257091a59ac79ab0807305c535a.zip |
-logging, indenting
Diffstat (limited to 'src/fragmentation')
-rw-r--r-- | src/fragmentation/fragmentation.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c index 6dad6d6d7..dd6e6774b 100644 --- a/src/fragmentation/fragmentation.c +++ b/src/fragmentation/fragmentation.c | |||
@@ -203,12 +203,19 @@ transmit_next (void *cls, | |||
203 | else | 203 | else |
204 | fsize = fc->mtu; | 204 | fsize = fc->mtu; |
205 | if (NULL != fc->tracker) | 205 | if (NULL != fc->tracker) |
206 | delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, fsize); | 206 | delay = GNUNET_BANDWIDTH_tracker_get_delay (fc->tracker, |
207 | fsize); | ||
207 | else | 208 | else |
208 | delay = GNUNET_TIME_UNIT_ZERO; | 209 | delay = GNUNET_TIME_UNIT_ZERO; |
209 | if (delay.rel_value_us > 0) | 210 | if (delay.rel_value_us > 0) |
210 | { | 211 | { |
211 | fc->task = GNUNET_SCHEDULER_add_delayed (delay, &transmit_next, fc); | 212 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
213 | "Fragmentation logic delays transmission of next fragment by %s\n", | ||
214 | GNUNET_STRINGS_relative_time_to_string (delay, | ||
215 | GNUNET_YES)); | ||
216 | fc->task = GNUNET_SCHEDULER_add_delayed (delay, | ||
217 | &transmit_next, | ||
218 | fc); | ||
212 | return; | 219 | return; |
213 | } | 220 | } |
214 | fc->next_transmission = (fc->next_transmission + 1) % 64; | 221 | fc->next_transmission = (fc->next_transmission + 1) % 64; |
@@ -273,7 +280,8 @@ transmit_next (void *cls, | |||
273 | fc->proc_busy = GNUNET_YES; | 280 | fc->proc_busy = GNUNET_YES; |
274 | fc->delay_until = GNUNET_TIME_relative_to_absolute (delay); | 281 | fc->delay_until = GNUNET_TIME_relative_to_absolute (delay); |
275 | fc->num_transmissions++; | 282 | fc->num_transmissions++; |
276 | fc->proc (fc->proc_cls, &fh->header); | 283 | fc->proc (fc->proc_cls, |
284 | &fh->header); | ||
277 | } | 285 | } |
278 | 286 | ||
279 | 287 | ||
@@ -331,7 +339,8 @@ GNUNET_FRAGMENT_context_create (struct GNUNET_STATISTICS_Handle *stats, | |||
331 | fc->proc = proc; | 339 | fc->proc = proc; |
332 | fc->proc_cls = proc_cls; | 340 | fc->proc_cls = proc_cls; |
333 | fc->fragment_id = | 341 | fc->fragment_id = |
334 | GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX); | 342 | GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, |
343 | UINT32_MAX); | ||
335 | memcpy (&fc[1], msg, size); | 344 | memcpy (&fc[1], msg, size); |
336 | bits = | 345 | bits = |
337 | (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu - | 346 | (size + mtu - sizeof (struct FragmentHeader) - 1) / (mtu - |