diff options
Diffstat (limited to 'src/core/gnunet-service-core_sessions.c')
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 83b1147b8..a168eeed3 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -118,12 +118,12 @@ struct Session | |||
118 | /** | 118 | /** |
119 | * Task to transmit corked messages with a delay. | 119 | * Task to transmit corked messages with a delay. |
120 | */ | 120 | */ |
121 | GNUNET_SCHEDULER_TaskIdentifier cork_task; | 121 | struct GNUNET_SCHEDULER_Task * cork_task; |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * Task to transmit our type map. | 124 | * Task to transmit our type map. |
125 | */ | 125 | */ |
126 | GNUNET_SCHEDULER_TaskIdentifier typemap_task; | 126 | struct GNUNET_SCHEDULER_Task * typemap_task; |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * Retransmission delay we currently use for the typemap | 129 | * Retransmission delay we currently use for the typemap |
@@ -213,10 +213,10 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
213 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 213 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
214 | "Destroying session for peer `%4s'\n", | 214 | "Destroying session for peer `%4s'\n", |
215 | GNUNET_i2s (&session->peer)); | 215 | GNUNET_i2s (&session->peer)); |
216 | if (GNUNET_SCHEDULER_NO_TASK != session->cork_task) | 216 | if (NULL != session->cork_task) |
217 | { | 217 | { |
218 | GNUNET_SCHEDULER_cancel (session->cork_task); | 218 | GNUNET_SCHEDULER_cancel (session->cork_task); |
219 | session->cork_task = GNUNET_SCHEDULER_NO_TASK; | 219 | session->cork_task = NULL; |
220 | } | 220 | } |
221 | while (NULL != (car = session->active_client_request_head)) | 221 | while (NULL != (car = session->active_client_request_head)) |
222 | { | 222 | { |
@@ -231,10 +231,10 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
231 | sme); | 231 | sme); |
232 | GNUNET_free (sme); | 232 | GNUNET_free (sme); |
233 | } | 233 | } |
234 | if (GNUNET_SCHEDULER_NO_TASK != session->typemap_task) | 234 | if (NULL != session->typemap_task) |
235 | { | 235 | { |
236 | GNUNET_SCHEDULER_cancel (session->typemap_task); | 236 | GNUNET_SCHEDULER_cancel (session->typemap_task); |
237 | session->typemap_task = GNUNET_SCHEDULER_NO_TASK; | 237 | session->typemap_task = NULL; |
238 | } | 238 | } |
239 | GSC_CLIENTS_notify_clients_about_neighbour (&session->peer, | 239 | GSC_CLIENTS_notify_clients_about_neighbour (&session->peer, |
240 | session->tmap, NULL); | 240 | session->tmap, NULL); |
@@ -291,7 +291,7 @@ transmit_typemap_task (void *cls, | |||
291 | static void | 291 | static void |
292 | start_typemap_task (struct Session *session) | 292 | start_typemap_task (struct Session *session) |
293 | { | 293 | { |
294 | if (GNUNET_SCHEDULER_NO_TASK != session->typemap_task) | 294 | if (NULL != session->typemap_task) |
295 | GNUNET_SCHEDULER_cancel (session->typemap_task); | 295 | GNUNET_SCHEDULER_cancel (session->typemap_task); |
296 | session->typemap_delay = GNUNET_TIME_UNIT_SECONDS; | 296 | session->typemap_delay = GNUNET_TIME_UNIT_SECONDS; |
297 | session->typemap_task = | 297 | session->typemap_task = |
@@ -395,10 +395,10 @@ GSC_SESSIONS_confirm_typemap (const struct GNUNET_PeerIdentity *peer, | |||
395 | 1, GNUNET_NO); | 395 | 1, GNUNET_NO); |
396 | return; | 396 | return; |
397 | } | 397 | } |
398 | if (GNUNET_SCHEDULER_NO_TASK != session->typemap_task) | 398 | if (NULL != session->typemap_task) |
399 | { | 399 | { |
400 | GNUNET_SCHEDULER_cancel (session->typemap_task); | 400 | GNUNET_SCHEDULER_cancel (session->typemap_task); |
401 | session->typemap_task = GNUNET_SCHEDULER_NO_TASK; | 401 | session->typemap_task = NULL; |
402 | } | 402 | } |
403 | GNUNET_STATISTICS_update (GSC_stats, | 403 | GNUNET_STATISTICS_update (GSC_stats, |
404 | gettext_noop | 404 | gettext_noop |
@@ -606,7 +606,7 @@ pop_cork_task (void *cls, | |||
606 | { | 606 | { |
607 | struct Session *session = cls; | 607 | struct Session *session = cls; |
608 | 608 | ||
609 | session->cork_task = GNUNET_SCHEDULER_NO_TASK; | 609 | session->cork_task = NULL; |
610 | try_transmission (session); | 610 | try_transmission (session); |
611 | } | 611 | } |
612 | 612 | ||
@@ -720,7 +720,7 @@ try_transmission (struct Session *session) | |||
720 | "Corking until %s\n", | 720 | "Corking until %s\n", |
721 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (min_deadline), | 721 | GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (min_deadline), |
722 | GNUNET_YES)); | 722 | GNUNET_YES)); |
723 | if (GNUNET_SCHEDULER_NO_TASK != session->cork_task) | 723 | if (NULL != session->cork_task) |
724 | GNUNET_SCHEDULER_cancel (session->cork_task); | 724 | GNUNET_SCHEDULER_cancel (session->cork_task); |
725 | session->cork_task = | 725 | session->cork_task = |
726 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (min_deadline), | 726 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_absolute_get_remaining (min_deadline), |