summaryrefslogtreecommitdiff
path: root/vpn/plugins/vpn.c
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2012-11-30 09:30:35 (GMT)
committerPatrik Flykt <patrik.flykt@linux.intel.com>2012-11-30 13:01:18 (GMT)
commita4c8f6b74733d0cf1d8c730aabd2ff5a7be0c124 (patch)
tree482caff971b44e952ae053cbd40e02c346c28d55 /vpn/plugins/vpn.c
parent2e9c60a0539679ac982282ebe9fc9c9cc43e492c (diff)
downloadconnman-a4c8f6b74733d0cf1d8c730aabd2ff5a7be0c124.zip
connman-a4c8f6b74733d0cf1d8c730aabd2ff5a7be0c124.tar.gz
connman-a4c8f6b74733d0cf1d8c730aabd2ff5a7be0c124.tar.bz2
vpn: Add initial support for async connect
Needed for agent VPN support.
Diffstat (limited to 'vpn/plugins/vpn.c')
-rw-r--r--vpn/plugins/vpn.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c
index d0b3381..66a75d2 100644
--- a/vpn/plugins/vpn.c
+++ b/vpn/plugins/vpn.c
@@ -353,7 +353,8 @@ exist_err:
return ret;
}
-static int vpn_connect(struct vpn_provider *provider)
+static int vpn_connect(struct vpn_provider *provider,
+ vpn_provider_connect_cb_t cb, void *user_data)
{
struct vpn_data *data = vpn_provider_get_data(provider);
struct vpn_driver_data *vpn_driver_data;
@@ -410,7 +411,7 @@ static int vpn_connect(struct vpn_provider *provider)
}
ret = vpn_driver_data->vpn_driver->connect(provider, data->task,
- data->if_name);
+ data->if_name, cb, user_data);
if (ret < 0) {
stop_vpn(provider);
connman_task_destroy(data->task);