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/vpn | |
parent | 7746f68db77b9ca3c4aaca24ab2ce5253461240b (diff) | |
download | gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.tar.gz gnunet-95f9076a2139f5fb042b944a0658b6cda2fa35db.zip |
implementing new scheduler shutdown semantics
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 5 | ||||
-rw-r--r-- | src/vpn/gnunet-vpn.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 58eda367f..2c3ac72fa 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -3099,9 +3099,8 @@ run (void *cls, | |||
3099 | &message_token, NULL, NULL); | 3099 | &message_token, NULL, NULL); |
3100 | nc = GNUNET_SERVER_notification_context_create (server, 1); | 3100 | nc = GNUNET_SERVER_notification_context_create (server, 1); |
3101 | GNUNET_SERVER_add_handlers (server, service_handlers); | 3101 | GNUNET_SERVER_add_handlers (server, service_handlers); |
3102 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 3102 | GNUNET_SCHEDULER_add_shutdown (&cleanup, |
3103 | &cleanup, | 3103 | NULL); |
3104 | NULL); | ||
3105 | } | 3104 | } |
3106 | 3105 | ||
3107 | 3106 | ||
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c index d4acee49e..2e7daf7f7 100644 --- a/src/vpn/gnunet-vpn.c +++ b/src/vpn/gnunet-vpn.c | |||
@@ -163,7 +163,9 @@ allocation_cb (void *cls, | |||
163 | * @param cfg configuration | 163 | * @param cfg configuration |
164 | */ | 164 | */ |
165 | static void | 165 | static void |
166 | run (void *cls, char *const *args, const char *cfgfile, | 166 | run (void *cls, |
167 | char *const *args, | ||
168 | const char *cfgfile, | ||
167 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 169 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
168 | { | 170 | { |
169 | int dst_af; | 171 | int dst_af; |
@@ -177,8 +179,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
177 | struct GNUNET_TIME_Absolute etime; | 179 | struct GNUNET_TIME_Absolute etime; |
178 | 180 | ||
179 | etime = GNUNET_TIME_relative_to_absolute (duration); | 181 | etime = GNUNET_TIME_relative_to_absolute (duration); |
180 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 182 | GNUNET_SCHEDULER_add_shutdown (&do_disconnect, NULL); |
181 | &do_disconnect, NULL); | ||
182 | handle = GNUNET_VPN_connect (cfg); | 183 | handle = GNUNET_VPN_connect (cfg); |
183 | if (NULL == handle) | 184 | if (NULL == handle) |
184 | goto error; | 185 | goto error; |