diff options
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 2b0b8939e..132406799 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -226,17 +226,17 @@ struct GNUNET_ATS_Session | |||
226 | /** | 226 | /** |
227 | * Session timeout task | 227 | * Session timeout task |
228 | */ | 228 | */ |
229 | struct GNUNET_SCHEDULER_Task * put_disconnect_task; | 229 | struct GNUNET_SCHEDULER_Task *put_disconnect_task; |
230 | 230 | ||
231 | /** | 231 | /** |
232 | * Session timeout task | 232 | * Session timeout task |
233 | */ | 233 | */ |
234 | struct GNUNET_SCHEDULER_Task * timeout_task; | 234 | struct GNUNET_SCHEDULER_Task *timeout_task; |
235 | 235 | ||
236 | /** | 236 | /** |
237 | * Task to wake up client receive handle when receiving is allowed again | 237 | * Task to wake up client receive handle when receiving is allowed again |
238 | */ | 238 | */ |
239 | struct GNUNET_SCHEDULER_Task * recv_wakeup_task; | 239 | struct GNUNET_SCHEDULER_Task *recv_wakeup_task; |
240 | 240 | ||
241 | /** | 241 | /** |
242 | * Absolute time when to receive data again. | 242 | * Absolute time when to receive data again. |
@@ -1130,12 +1130,8 @@ static void | |||
1130 | client_wake_up (void *cls) | 1130 | client_wake_up (void *cls) |
1131 | { | 1131 | { |
1132 | struct GNUNET_ATS_Session *s = cls; | 1132 | struct GNUNET_ATS_Session *s = cls; |
1133 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
1134 | 1133 | ||
1135 | s->recv_wakeup_task = NULL; | 1134 | s->recv_wakeup_task = NULL; |
1136 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
1137 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
1138 | return; | ||
1139 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1135 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1140 | "Session %p/request %p: Waking up GET handle\n", | 1136 | "Session %p/request %p: Waking up GET handle\n", |
1141 | s, s->get.easyhandle); | 1137 | s, s->get.easyhandle); |
@@ -1301,13 +1297,8 @@ client_run (void *cls) | |||
1301 | CURLMsg *msg; | 1297 | CURLMsg *msg; |
1302 | int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */ | 1298 | int put_request; /* GNUNET_YES if easy handle is put, GNUNET_NO for get */ |
1303 | int msgs_left; | 1299 | int msgs_left; |
1304 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
1305 | 1300 | ||
1306 | plugin->client_perform_task = NULL; | 1301 | plugin->client_perform_task = NULL; |
1307 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
1308 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
1309 | return; | ||
1310 | |||
1311 | /* While data are available or timeouts occured */ | 1302 | /* While data are available or timeouts occured */ |
1312 | do | 1303 | do |
1313 | { | 1304 | { |
@@ -2379,8 +2370,10 @@ http_client_plugin_update_inbound_delay (void *cls, | |||
2379 | if (s->recv_wakeup_task != NULL) | 2370 | if (s->recv_wakeup_task != NULL) |
2380 | { | 2371 | { |
2381 | GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); | 2372 | GNUNET_SCHEDULER_cancel (s->recv_wakeup_task); |
2382 | s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delay, | 2373 | s->recv_wakeup_task |
2383 | &client_wake_up, s); | 2374 | = GNUNET_SCHEDULER_add_delayed (delay, |
2375 | &client_wake_up, | ||
2376 | s); | ||
2384 | } | 2377 | } |
2385 | } | 2378 | } |
2386 | 2379 | ||