diff options
Diffstat (limited to 'src/hostlist/gnunet-daemon-hostlist_server.c')
-rw-r--r-- | src/hostlist/gnunet-daemon-hostlist_server.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c index 9c8b14598..542fa1a98 100644 --- a/src/hostlist/gnunet-daemon-hostlist_server.c +++ b/src/hostlist/gnunet-daemon-hostlist_server.c | |||
@@ -74,12 +74,12 @@ static struct GNUNET_PEERINFO_NotifyContext *notify; | |||
74 | /** | 74 | /** |
75 | * Our primary task for IPv4. | 75 | * Our primary task for IPv4. |
76 | */ | 76 | */ |
77 | static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v4; | 77 | static struct GNUNET_SCHEDULER_Task * hostlist_task_v4; |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * Our primary task for IPv6. | 80 | * Our primary task for IPv6. |
81 | */ | 81 | */ |
82 | static GNUNET_SCHEDULER_TaskIdentifier hostlist_task_v6; | 82 | static struct GNUNET_SCHEDULER_Task * hostlist_task_v6; |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Our canonical response. | 85 | * Our canonical response. |
@@ -618,7 +618,7 @@ process_notify (void *cls, | |||
618 | * Function that queries MHD's select sets and | 618 | * Function that queries MHD's select sets and |
619 | * starts the task waiting for them. | 619 | * starts the task waiting for them. |
620 | */ | 620 | */ |
621 | static GNUNET_SCHEDULER_TaskIdentifier | 621 | static struct GNUNET_SCHEDULER_Task * |
622 | prepare_daemon (struct MHD_Daemon *daemon_handle); | 622 | prepare_daemon (struct MHD_Daemon *daemon_handle); |
623 | 623 | ||
624 | 624 | ||
@@ -636,9 +636,9 @@ run_daemon (void *cls, | |||
636 | struct MHD_Daemon *daemon_handle = cls; | 636 | struct MHD_Daemon *daemon_handle = cls; |
637 | 637 | ||
638 | if (daemon_handle == daemon_handle_v4) | 638 | if (daemon_handle == daemon_handle_v4) |
639 | hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK; | 639 | hostlist_task_v4 = NULL; |
640 | else | 640 | else |
641 | hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK; | 641 | hostlist_task_v6 = NULL; |
642 | 642 | ||
643 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 643 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
644 | return; | 644 | return; |
@@ -656,10 +656,10 @@ run_daemon (void *cls, | |||
656 | * | 656 | * |
657 | * @param daemon_handle HTTP server to prepare to run | 657 | * @param daemon_handle HTTP server to prepare to run |
658 | */ | 658 | */ |
659 | static GNUNET_SCHEDULER_TaskIdentifier | 659 | static struct GNUNET_SCHEDULER_Task * |
660 | prepare_daemon (struct MHD_Daemon *daemon_handle) | 660 | prepare_daemon (struct MHD_Daemon *daemon_handle) |
661 | { | 661 | { |
662 | GNUNET_SCHEDULER_TaskIdentifier ret; | 662 | struct GNUNET_SCHEDULER_Task * ret; |
663 | fd_set rs; | 663 | fd_set rs; |
664 | fd_set ws; | 664 | fd_set ws; |
665 | fd_set es; | 665 | fd_set es; |
@@ -917,15 +917,15 @@ GNUNET_HOSTLIST_server_stop () | |||
917 | { | 917 | { |
918 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 918 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
919 | "Hostlist server shutdown\n"); | 919 | "Hostlist server shutdown\n"); |
920 | if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v6) | 920 | if (NULL != hostlist_task_v6) |
921 | { | 921 | { |
922 | GNUNET_SCHEDULER_cancel (hostlist_task_v6); | 922 | GNUNET_SCHEDULER_cancel (hostlist_task_v6); |
923 | hostlist_task_v6 = GNUNET_SCHEDULER_NO_TASK; | 923 | hostlist_task_v6 = NULL; |
924 | } | 924 | } |
925 | if (GNUNET_SCHEDULER_NO_TASK != hostlist_task_v4) | 925 | if (NULL != hostlist_task_v4) |
926 | { | 926 | { |
927 | GNUNET_SCHEDULER_cancel (hostlist_task_v4); | 927 | GNUNET_SCHEDULER_cancel (hostlist_task_v4); |
928 | hostlist_task_v4 = GNUNET_SCHEDULER_NO_TASK; | 928 | hostlist_task_v4 = NULL; |
929 | } | 929 | } |
930 | if (NULL != daemon_handle_v4) | 930 | if (NULL != daemon_handle_v4) |
931 | { | 931 | { |