diff options
Diffstat (limited to 'src/fragmentation/defragmentation.c')
-rw-r--r-- | src/fragmentation/defragmentation.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c index 478a9c658..e3cf2298b 100644 --- a/src/fragmentation/defragmentation.c +++ b/src/fragmentation/defragmentation.c | |||
@@ -83,7 +83,7 @@ struct MessageContext | |||
83 | * Task scheduled for transmitting the next ACK to the | 83 | * Task scheduled for transmitting the next ACK to the |
84 | * other peer. | 84 | * other peer. |
85 | */ | 85 | */ |
86 | GNUNET_SCHEDULER_TaskIdentifier ack_task; | 86 | struct GNUNET_SCHEDULER_Task * ack_task; |
87 | 87 | ||
88 | /** | 88 | /** |
89 | * When did we receive which fragment? Used to calculate | 89 | * When did we receive which fragment? Used to calculate |
@@ -236,10 +236,10 @@ GNUNET_DEFRAGMENT_context_destroy (struct GNUNET_DEFRAGMENT_Context *dc) | |||
236 | { | 236 | { |
237 | GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, mc); | 237 | GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, mc); |
238 | dc->list_size--; | 238 | dc->list_size--; |
239 | if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task) | 239 | if (NULL != mc->ack_task) |
240 | { | 240 | { |
241 | GNUNET_SCHEDULER_cancel (mc->ack_task); | 241 | GNUNET_SCHEDULER_cancel (mc->ack_task); |
242 | mc->ack_task = GNUNET_SCHEDULER_NO_TASK; | 242 | mc->ack_task = NULL; |
243 | } | 243 | } |
244 | GNUNET_free (mc); | 244 | GNUNET_free (mc); |
245 | } | 245 | } |
@@ -261,7 +261,7 @@ send_ack (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
261 | struct GNUNET_DEFRAGMENT_Context *dc = mc->dc; | 261 | struct GNUNET_DEFRAGMENT_Context *dc = mc->dc; |
262 | struct FragmentAcknowledgement fa; | 262 | struct FragmentAcknowledgement fa; |
263 | 263 | ||
264 | mc->ack_task = GNUNET_SCHEDULER_NO_TASK; | 264 | mc->ack_task = NULL; |
265 | fa.header.size = htons (sizeof (struct FragmentAcknowledgement)); | 265 | fa.header.size = htons (sizeof (struct FragmentAcknowledgement)); |
266 | fa.header.type = htons (GNUNET_MESSAGE_TYPE_FRAGMENT_ACK); | 266 | fa.header.type = htons (GNUNET_MESSAGE_TYPE_FRAGMENT_ACK); |
267 | fa.fragment_id = htonl (mc->fragment_id); | 267 | fa.fragment_id = htonl (mc->fragment_id); |
@@ -388,10 +388,10 @@ discard_oldest_mc (struct GNUNET_DEFRAGMENT_Context *dc) | |||
388 | GNUNET_assert (NULL != old); | 388 | GNUNET_assert (NULL != old); |
389 | GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, old); | 389 | GNUNET_CONTAINER_DLL_remove (dc->head, dc->tail, old); |
390 | dc->list_size--; | 390 | dc->list_size--; |
391 | if (GNUNET_SCHEDULER_NO_TASK != old->ack_task) | 391 | if (NULL != old->ack_task) |
392 | { | 392 | { |
393 | GNUNET_SCHEDULER_cancel (old->ack_task); | 393 | GNUNET_SCHEDULER_cancel (old->ack_task); |
394 | old->ack_task = GNUNET_SCHEDULER_NO_TASK; | 394 | old->ack_task = NULL; |
395 | } | 395 | } |
396 | GNUNET_free (old); | 396 | GNUNET_free (old); |
397 | } | 397 | } |
@@ -550,7 +550,7 @@ GNUNET_DEFRAGMENT_process_fragment (struct GNUNET_DEFRAGMENT_Context *dc, | |||
550 | linear sequence; ACK now! */ | 550 | linear sequence; ACK now! */ |
551 | delay = GNUNET_TIME_UNIT_ZERO; | 551 | delay = GNUNET_TIME_UNIT_ZERO; |
552 | } | 552 | } |
553 | if (GNUNET_SCHEDULER_NO_TASK != mc->ack_task) | 553 | if (NULL != mc->ack_task) |
554 | GNUNET_SCHEDULER_cancel (mc->ack_task); | 554 | GNUNET_SCHEDULER_cancel (mc->ack_task); |
555 | mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc); | 555 | mc->ack_task = GNUNET_SCHEDULER_add_delayed (delay, &send_ack, mc); |
556 | if (duplicate == GNUNET_YES) | 556 | if (duplicate == GNUNET_YES) |