diff options
| author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2013-03-07 12:34:42 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2013-03-08 12:10:29 +0200 |
| commit | 2f246127e624149fdcaa9170a25ed6c26c67596d (patch) | |
| tree | c4ed2e5598014a3a77d521de27d5aa570864a157 /vpn/vpn-provider.c | |
| parent | 7afe03781c917f26890e8caaf1804d60deb50627 (diff) | |
| download | connman-2f246127e624149fdcaa9170a25ed6c26c67596d.tar.gz connman-2f246127e624149fdcaa9170a25ed6c26c67596d.tar.bz2 connman-2f246127e624149fdcaa9170a25ed6c26c67596d.zip | |
vpn-provider: Do not quit vpnd if there are no VPN configurations
Because we now support provisioning of VPN services via .config file,
we need to keep vpnd running so that it can monitor the connman-vpn
directory for new config files.
Diffstat (limited to 'vpn/vpn-provider.c')
| -rw-r--r-- | vpn/vpn-provider.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c index 3b0ab8f4..09a3d55d 100644 --- a/vpn/vpn-provider.c +++ b/vpn/vpn-provider.c @@ -1010,8 +1010,6 @@ static void configuration_count_del(void) if (__sync_fetch_and_sub(&configuration_count, 1) != 1) return; - - raise(SIGTERM); } int __vpn_provider_disconnect(struct vpn_provider *provider) @@ -2471,28 +2469,6 @@ void vpn_provider_driver_unregister(struct vpn_provider_driver *driver) } } -static gboolean check_vpn_count(gpointer data) -{ - if (configuration_count == 0) { - connman_info("No VPN configurations found, quitting."); - raise(SIGTERM); - } - - return FALSE; -} - -void __vpn_provider_check_connections(void) -{ - /* - * If we were started when there is no providers configured, - * then just quit. This happens when connman starts and its - * vpn plugin asks connman-vpnd if it has any connections - * configured. If there are none, then we can stop the vpn - * daemon. - */ - g_timeout_add(1000, check_vpn_count, NULL); -} - const char *vpn_provider_get_name(struct vpn_provider *provider) { return provider->name; |