From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Fri, 14 Dec 2012 11:01:18 +0000 (+0200)
Subject: vpn-provider: Set state when connecting and disconnecting
X-Git-Tag: 1.10~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=635e902a6667d6fafd66d5e027d993b8bc31ab55;p=platform%2Fupstream%2Fconnman.git

vpn-provider: Set state when connecting and disconnecting

Update provider state when connect or disconnect is initiated.
---

diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
index 0b164c0..e98573f 100644
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -966,14 +966,10 @@ int __vpn_provider_disconnect(struct vpn_provider *provider)
 	else
 		return -EOPNOTSUPP;
 
-	if (err < 0) {
-		if (err != -EINPROGRESS)
-			return err;
-
-		return -EINPROGRESS;
-	}
+	if (err == -EINPROGRESS)
+		vpn_provider_set_state(provider, VPN_PROVIDER_STATE_CONNECT);
 
-	return 0;
+	return err;
 }
 
 static void connect_cb(struct vpn_provider *provider, void *user_data,
@@ -1009,6 +1005,9 @@ int __vpn_provider_connect(struct vpn_provider *provider, DBusMessage *msg)
 	} else
 		return -EOPNOTSUPP;
 
+	if (err == -EINPROGRESS)
+		vpn_provider_set_state(provider, VPN_PROVIDER_STATE_CONNECT);
+
 	return err;
 }