summaryrefslogtreecommitdiff
path: root/vpn
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-03-07 10:34:42 (GMT)
committerPatrik Flykt <patrik.flykt@linux.intel.com>2013-03-08 10:10:29 (GMT)
commit2f246127e624149fdcaa9170a25ed6c26c67596d (patch)
treec4ed2e5598014a3a77d521de27d5aa570864a157 /vpn
parent7afe03781c917f26890e8caaf1804d60deb50627 (diff)
downloadconnman-2f246127e624149fdcaa9170a25ed6c26c67596d.zip
connman-2f246127e624149fdcaa9170a25ed6c26c67596d.tar.gz
connman-2f246127e624149fdcaa9170a25ed6c26c67596d.tar.bz2
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')
-rw-r--r--vpn/vpn-manager.c2
-rw-r--r--vpn/vpn-provider.c24
-rw-r--r--vpn/vpn.h1
3 files changed, 0 insertions, 27 deletions
diff --git a/vpn/vpn-manager.c b/vpn/vpn-manager.c
index 44684dd..1ba745b 100644
--- a/vpn/vpn-manager.c
+++ b/vpn/vpn-manager.c
@@ -85,8 +85,6 @@ static DBusMessage *get_connections(DBusConnection *conn, DBusMessage *msg,
if (reply == NULL)
return __connman_error_failed(msg, -EINVAL);
- __vpn_provider_check_connections();
-
return reply;
}
diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 3b0ab8f..09a3d55 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;
diff --git a/vpn/vpn.h b/vpn/vpn.h
index c57fcf7..c430ef5 100644
--- a/vpn/vpn.h
+++ b/vpn/vpn.h
@@ -93,7 +93,6 @@ int __vpn_provider_connect_path(const char *path);
int __vpn_provider_disconnect(struct vpn_provider *provider);
int __vpn_provider_remove(const char *path);
int __vpn_provider_delete(struct vpn_provider *provider);
-void __vpn_provider_check_connections(void);
void __vpn_provider_cleanup(void);
int __vpn_provider_init(gboolean handle_routes);