diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-12-14 13:01:17 +0200 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-12-14 16:15:12 +0200 |
| commit | 61812a36b5553a0630d90892de5b0192667fa988 (patch) | |
| tree | 1656cfd24a948dc1aa3b182178ccc67407b61d9e | |
| parent | cf1d92799bb026156f90cc1ec043f6a408cb3925 (diff) | |
| download | connman-61812a36b5553a0630d90892de5b0192667fa988.tar.gz connman-61812a36b5553a0630d90892de5b0192667fa988.tar.bz2 connman-61812a36b5553a0630d90892de5b0192667fa988.zip | |
vpn-plugin: Send proper response to caller and connect if needed
Send a proper response to the caller and attempt to connect if the
provider data exists but is not connected.
| -rw-r--r-- | vpn/plugins/vpn.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c index 05068f58..99f829cd 100644 --- a/vpn/plugins/vpn.c +++ b/vpn/plugins/vpn.c @@ -54,7 +54,7 @@ struct vpn_data { char *if_name; unsigned flags; unsigned int watch; - unsigned int state; + enum vpn_state state; struct connman_task *task; }; @@ -360,21 +360,40 @@ static int vpn_connect(struct vpn_provider *provider, struct vpn_driver_data *vpn_driver_data; const char *name; int ret = 0; + enum vpn_state state = VPN_STATE_UNKNOWN; if (data != NULL) - return -EISCONN; + state = data->state; - data = g_try_new0(struct vpn_data, 1); - if (data == NULL) - return -ENOMEM; + DBG("data %p state %d", data, state); + + switch (state) { + case VPN_STATE_UNKNOWN: + data = g_try_new0(struct vpn_data, 1); + if (data == NULL) + return -ENOMEM; + + data->provider = vpn_provider_ref(provider); + data->watch = 0; + data->flags = 0; + data->task = NULL; + + vpn_provider_set_data(provider, data); + /* fall through */ - data->provider = vpn_provider_ref(provider); - data->watch = 0; - data->flags = 0; - data->task = NULL; - data->state = VPN_STATE_IDLE; + case VPN_STATE_DISCONNECT: + case VPN_STATE_IDLE: + case VPN_STATE_FAILURE: + case VPN_STATE_AUTH_FAILURE: + data->state = VPN_STATE_IDLE; + break; - vpn_provider_set_data(provider, data); + case VPN_STATE_CONNECT: + return -EINPROGRESS; + + case VPN_STATE_READY: + return -EISCONN; + } name = vpn_provider_get_driver_name(provider); if (name == NULL) |