diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-04-30 08:17:37 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-04-30 08:17:37 +0000 |
commit | 95f9076a2139f5fb042b944a0658b6cda2fa35db (patch) | |
tree | b0826a2a1dcf812e6b4450fe6b05d47cd53ae49d /src/exit | |
parent | 7746f68db77b9ca3c4aaca24ab2ce5253461240b (diff) | |
download | gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.tar.gz gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.zip |
implementing new scheduler shutdown semantics
Diffstat (limited to 'src/exit')
-rw-r--r-- | src/exit/gnunet-daemon-exit.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c index 8456018ab..f31e11d83 100644 --- a/src/exit/gnunet-daemon-exit.c +++ b/src/exit/gnunet-daemon-exit.c | |||
@@ -3149,7 +3149,6 @@ dummy_task (void *cls) | |||
3149 | * Function scheduled as very last function, cleans up after us | 3149 | * Function scheduled as very last function, cleans up after us |
3150 | * | 3150 | * |
3151 | * @param cls NULL | 3151 | * @param cls NULL |
3152 | * @param tc scheduler context | ||
3153 | */ | 3152 | */ |
3154 | static void | 3153 | static void |
3155 | cleanup (void *cls) | 3154 | cleanup (void *cls) |
@@ -3548,9 +3547,8 @@ run (void *cls, | |||
3548 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3547 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
3549 | _("`%s' must be installed SUID, EXIT will not work\n"), | 3548 | _("`%s' must be installed SUID, EXIT will not work\n"), |
3550 | "gnunet-helper-exit"); | 3549 | "gnunet-helper-exit"); |
3551 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 3550 | GNUNET_SCHEDULER_add_shutdown (&dummy_task, |
3552 | &dummy_task, | 3551 | NULL); |
3553 | NULL); | ||
3554 | global_ret = 1; | 3552 | global_ret = 1; |
3555 | return; | 3553 | return; |
3556 | } | 3554 | } |
@@ -3639,9 +3637,8 @@ run (void *cls, | |||
3639 | app_idx++; | 3637 | app_idx++; |
3640 | } | 3638 | } |
3641 | GNUNET_free_non_null (dns_exit); | 3639 | GNUNET_free_non_null (dns_exit); |
3642 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 3640 | GNUNET_SCHEDULER_add_shutdown (&cleanup, |
3643 | &cleanup, | 3641 | NULL); |
3644 | cls); | ||
3645 | 3642 | ||
3646 | if (GNUNET_OK != | 3643 | if (GNUNET_OK != |
3647 | GNUNET_CONFIGURATION_get_value_number (cfg, "exit", "MAX_CONNECTIONS", | 3644 | GNUNET_CONFIGURATION_get_value_number (cfg, "exit", "MAX_CONNECTIONS", |