From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Mon, 13 Aug 2012 09:51:31 +0000 (+0300)
Subject: service: Disconnect provider after connection timeout
X-Git-Tag: 1.5~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe2550f3e14bd24d72ed00296b6c693d9f453488;p=platform%2Fupstream%2Fconnman.git

service: Disconnect provider after connection timeout

The provider was not disconnected after a connection timeout.
This lead to weird issues in VPN code; like following provider
connect request would disconnect the earlier VPN connection and
report EALREADY to the user.
---

diff --git a/src/service.c b/src/service.c
index 16b1494d..14a8d22b 100644
--- a/src/service.c
+++ b/src/service.c
@@ -3511,6 +3511,8 @@ static gboolean connect_timeout(gpointer user_data)
 
 	if (service->network != NULL)
 		__connman_network_disconnect(service->network);
+	else if (service->provider != NULL)
+		__connman_provider_disconnect(service->provider);
 
 	__connman_ipconfig_disable(service->ipconfig_ipv4);
 	__connman_ipconfig_disable(service->ipconfig_ipv6);