diff options
Diffstat (limited to 'src/transport/gnunet-service-transport_manipulation.c')
-rw-r--r-- | src/transport/gnunet-service-transport_manipulation.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index bfd2594a8..0d0249bc2 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -92,7 +92,7 @@ struct TM_Peer | |||
92 | /** | 92 | /** |
93 | * Task to schedule delayed sendding | 93 | * Task to schedule delayed sendding |
94 | */ | 94 | */ |
95 | GNUNET_SCHEDULER_TaskIdentifier send_delay_task; | 95 | struct GNUNET_SCHEDULER_Task * send_delay_task; |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * Send queue DLL head | 98 | * Send queue DLL head |
@@ -191,7 +191,7 @@ struct DelayQueueEntry *generic_dqe_tail; | |||
191 | /** | 191 | /** |
192 | * Task to schedule delayed sending based on general delay | 192 | * Task to schedule delayed sending based on general delay |
193 | */ | 193 | */ |
194 | GNUNET_SCHEDULER_TaskIdentifier generic_send_delay_task; | 194 | struct GNUNET_SCHEDULER_Task * generic_send_delay_task; |
195 | 195 | ||
196 | static void | 196 | static void |
197 | set_metric(struct TM_Peer *dest, int direction, uint32_t type, uint32_t value) | 197 | set_metric(struct TM_Peer *dest, int direction, uint32_t type, uint32_t value) |
@@ -358,7 +358,7 @@ send_delayed(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
358 | if (NULL != tmp) | 358 | if (NULL != tmp) |
359 | { | 359 | { |
360 | GNUNET_break(GNUNET_YES == GST_neighbours_test_connected (&dqe->id)); | 360 | GNUNET_break(GNUNET_YES == GST_neighbours_test_connected (&dqe->id)); |
361 | tmp->send_delay_task = GNUNET_SCHEDULER_NO_TASK; | 361 | tmp->send_delay_task = NULL; |
362 | GNUNET_CONTAINER_DLL_remove(tmp->send_head, tmp->send_tail, dqe); | 362 | GNUNET_CONTAINER_DLL_remove(tmp->send_head, tmp->send_tail, dqe); |
363 | GST_neighbours_send(&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, | 363 | GST_neighbours_send(&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, |
364 | dqe->cont, dqe->cont_cls); | 364 | dqe->cont, dqe->cont_cls); |
@@ -376,7 +376,7 @@ send_delayed(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
376 | { | 376 | { |
377 | /* Remove from generic queue */ | 377 | /* Remove from generic queue */ |
378 | GNUNET_break(GNUNET_YES == GST_neighbours_test_connected (&dqe->id)); | 378 | GNUNET_break(GNUNET_YES == GST_neighbours_test_connected (&dqe->id)); |
379 | generic_send_delay_task = GNUNET_SCHEDULER_NO_TASK; | 379 | generic_send_delay_task = NULL; |
380 | GNUNET_CONTAINER_DLL_remove(generic_dqe_head, generic_dqe_tail, dqe); | 380 | GNUNET_CONTAINER_DLL_remove(generic_dqe_head, generic_dqe_tail, dqe); |
381 | GST_neighbours_send(&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, | 381 | GST_neighbours_send(&dqe->id, dqe->msg, dqe->msg_size, dqe->timeout, |
382 | dqe->cont, dqe->cont_cls); | 382 | dqe->cont, dqe->cont_cls); |
@@ -434,7 +434,7 @@ GST_manipulation_send(const struct GNUNET_PeerIdentity *target, const void *msg, | |||
434 | dqe->timeout = timeout; | 434 | dqe->timeout = timeout; |
435 | memcpy(dqe->msg, msg, msg_size); | 435 | memcpy(dqe->msg, msg, msg_size); |
436 | GNUNET_CONTAINER_DLL_insert_tail(tmp->send_head, tmp->send_tail, dqe); | 436 | GNUNET_CONTAINER_DLL_insert_tail(tmp->send_head, tmp->send_tail, dqe); |
437 | if (GNUNET_SCHEDULER_NO_TASK == tmp->send_delay_task) | 437 | if (NULL == tmp->send_delay_task) |
438 | tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, | 438 | tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, |
439 | &send_delayed, dqe); | 439 | &send_delayed, dqe); |
440 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 440 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
@@ -462,7 +462,7 @@ GST_manipulation_send(const struct GNUNET_PeerIdentity *target, const void *msg, | |||
462 | dqe->timeout = timeout; | 462 | dqe->timeout = timeout; |
463 | memcpy(dqe->msg, msg, msg_size); | 463 | memcpy(dqe->msg, msg, msg_size); |
464 | GNUNET_CONTAINER_DLL_insert_tail(generic_dqe_head, generic_dqe_tail, dqe); | 464 | GNUNET_CONTAINER_DLL_insert_tail(generic_dqe_head, generic_dqe_tail, dqe); |
465 | if (GNUNET_SCHEDULER_NO_TASK == generic_send_delay_task) | 465 | if (NULL == generic_send_delay_task) |
466 | { | 466 | { |
467 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, | 467 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, |
468 | &send_delayed, dqe); | 468 | &send_delayed, dqe); |
@@ -642,10 +642,10 @@ free_tmps(void *cls, const struct GNUNET_PeerIdentity *key, void *value) | |||
642 | dqe->cont(dqe->cont_cls, GNUNET_SYSERR, dqe->msg_size, 0); | 642 | dqe->cont(dqe->cont_cls, GNUNET_SYSERR, dqe->msg_size, 0); |
643 | GNUNET_free(dqe); | 643 | GNUNET_free(dqe); |
644 | } | 644 | } |
645 | if (GNUNET_SCHEDULER_NO_TASK != tmp->send_delay_task) | 645 | if (NULL != tmp->send_delay_task) |
646 | { | 646 | { |
647 | GNUNET_SCHEDULER_cancel(tmp->send_delay_task); | 647 | GNUNET_SCHEDULER_cancel(tmp->send_delay_task); |
648 | tmp->send_delay_task = GNUNET_SCHEDULER_NO_TASK; | 648 | tmp->send_delay_task = NULL; |
649 | } | 649 | } |
650 | GNUNET_free(tmp); | 650 | GNUNET_free(tmp); |
651 | } | 651 | } |
@@ -693,10 +693,10 @@ GST_manipulation_peer_disconnect(const struct GNUNET_PeerIdentity *peer) | |||
693 | GNUNET_free(dqe); | 693 | GNUNET_free(dqe); |
694 | } | 694 | } |
695 | } | 695 | } |
696 | if (GNUNET_SCHEDULER_NO_TASK != generic_send_delay_task) | 696 | if (NULL != generic_send_delay_task) |
697 | { | 697 | { |
698 | GNUNET_SCHEDULER_cancel(generic_send_delay_task); | 698 | GNUNET_SCHEDULER_cancel(generic_send_delay_task); |
699 | generic_send_delay_task = GNUNET_SCHEDULER_NO_TASK; | 699 | generic_send_delay_task = NULL; |
700 | if (NULL != generic_dqe_head) | 700 | if (NULL != generic_dqe_head) |
701 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed( | 701 | generic_send_delay_task = GNUNET_SCHEDULER_add_delayed( |
702 | GNUNET_TIME_absolute_get_remaining(generic_dqe_head->sent_at), | 702 | GNUNET_TIME_absolute_get_remaining(generic_dqe_head->sent_at), |
@@ -725,10 +725,10 @@ GST_manipulation_stop() | |||
725 | cur->cont(cur->cont_cls, GNUNET_SYSERR, cur->msg_size, 0); | 725 | cur->cont(cur->cont_cls, GNUNET_SYSERR, cur->msg_size, 0); |
726 | GNUNET_free(cur); | 726 | GNUNET_free(cur); |
727 | } | 727 | } |
728 | if (GNUNET_SCHEDULER_NO_TASK != generic_send_delay_task) | 728 | if (NULL != generic_send_delay_task) |
729 | { | 729 | { |
730 | GNUNET_SCHEDULER_cancel(generic_send_delay_task); | 730 | GNUNET_SCHEDULER_cancel(generic_send_delay_task); |
731 | generic_send_delay_task = GNUNET_SCHEDULER_NO_TASK; | 731 | generic_send_delay_task = NULL; |
732 | } | 732 | } |
733 | 733 | ||
734 | free_metric(&man_handle.general); | 734 | free_metric(&man_handle.general); |