diff options
Diffstat (limited to 'src/rest/gnunet-rest-server.c')
-rw-r--r-- | src/rest/gnunet-rest-server.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c index 705fcbeb3..ffd65228a 100644 --- a/src/rest/gnunet-rest-server.c +++ b/src/rest/gnunet-rest-server.c | |||
@@ -61,7 +61,7 @@ | |||
61 | /** | 61 | /** |
62 | * The task ID | 62 | * The task ID |
63 | */ | 63 | */ |
64 | static struct GNUNET_SCHEDULER_Task * httpd_task; | 64 | static struct GNUNET_SCHEDULER_Task *httpd_task; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * The port the service is running on (default 7776) | 67 | * The port the service is running on (default 7776) |
@@ -396,6 +396,16 @@ kill_httpd () | |||
396 | GNUNET_SCHEDULER_cancel (httpd_task); | 396 | GNUNET_SCHEDULER_cancel (httpd_task); |
397 | httpd_task = NULL; | 397 | httpd_task = NULL; |
398 | } | 398 | } |
399 | if (NULL != ltask4) | ||
400 | { | ||
401 | GNUNET_SCHEDULER_cancel (ltask4); | ||
402 | ltask4 = NULL; | ||
403 | } | ||
404 | if (NULL != ltask6) | ||
405 | { | ||
406 | GNUNET_SCHEDULER_cancel (ltask6); | ||
407 | ltask6 = NULL; | ||
408 | } | ||
399 | } | 409 | } |
400 | 410 | ||
401 | 411 | ||
@@ -498,7 +508,6 @@ static void | |||
498 | do_accept (void *cls) | 508 | do_accept (void *cls) |
499 | { | 509 | { |
500 | struct GNUNET_NETWORK_Handle *lsock = cls; | 510 | struct GNUNET_NETWORK_Handle *lsock = cls; |
501 | const struct GNUNET_SCHEDULER_TaskContext *tc; | ||
502 | struct GNUNET_NETWORK_Handle *s; | 511 | struct GNUNET_NETWORK_Handle *s; |
503 | int fd; | 512 | int fd; |
504 | const struct sockaddr *addr; | 513 | const struct sockaddr *addr; |
@@ -508,9 +517,6 @@ do_accept (void *cls) | |||
508 | ltask4 = NULL; | 517 | ltask4 = NULL; |
509 | else | 518 | else |
510 | ltask6 = NULL; | 519 | ltask6 = NULL; |
511 | tc = GNUNET_SCHEDULER_get_task_context (); | ||
512 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | ||
513 | return; | ||
514 | if (lsock == lsock4) | 520 | if (lsock == lsock4) |
515 | ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, | 521 | ltask4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL, |
516 | lsock, | 522 | lsock, |
@@ -770,8 +776,7 @@ run (void *cls, | |||
770 | (void *) cfg, | 776 | (void *) cfg, |
771 | &load_plugin, | 777 | &load_plugin, |
772 | NULL); | 778 | NULL); |
773 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 779 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); |
774 | &do_shutdown, NULL); | ||
775 | } | 780 | } |
776 | 781 | ||
777 | 782 | ||