From: Daniel Wagner <daniel.wagner@bmw-carit.de>
Date: Mon, 9 May 2011 15:50:09 +0000 (+0200)
Subject: session: Use service session usage counting
X-Git-Tag: 0.74~56
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42aa191712e8c82fd1c84d9f5477aa6081b729fa;p=platform%2Fupstream%2Fconnman.git

session: Use service session usage counting

And introduce a new disconnect function which takes care if a service
has to be disconnected if no other session is using this service.
---

diff --git a/src/session.c b/src/session.c
index 698ba83..4175b9d 100644
--- a/src/session.c
+++ b/src/session.c
@@ -776,6 +776,26 @@ static connman_bool_t explicit_connect(enum connman_session_reason reason)
 	return FALSE;
 }
 
+static void test_and_disconnect(struct connman_session *session)
+{
+	struct session_info *info = &session->info;
+
+	if (explicit_connect(info->reason) == FALSE)
+		goto out;
+
+	if (__connman_service_session_dec(info->service) == TRUE)
+		goto out;
+
+	if (ecall_session != NULL && ecall_session != session)
+		goto out;
+
+	__connman_service_disconnect(info->service);
+
+out:
+	info->reason = CONNMAN_SESSION_REASON_UNKNOWN;
+	info->service = NULL;
+}
+
 static void select_and_connect(struct connman_session *session,
 				enum connman_session_reason reason)
 {
@@ -807,16 +827,16 @@ static void select_and_connect(struct connman_session *session,
 		iter = g_sequence_iter_next(iter);
 	}
 
-	if (info->service != NULL && info->service != service) {
-		__connman_service_disconnect(info->service);
-		info->reason = CONNMAN_SESSION_REASON_UNKNOWN;
-		info->service = NULL;
-	}
+	if (info->service != NULL && info->service != service)
+		test_and_disconnect(session);
 
 	if (service != NULL) {
 		info->reason = reason;
 		info->service = service;
 
+		if (explicit_connect(reason) == TRUE)
+			__connman_service_session_inc(info->service);
+
 		if (do_connect == TRUE)
 			__connman_service_connect(info->service);
 	}
@@ -848,10 +868,7 @@ static void session_changed(struct connman_session *session,
 				 * This service is not part of this
 				 * session anymore.
 				 */
-
-				if (info->reason == CONNMAN_SESSION_REASON_CONNECT)
-					__connman_service_disconnect(info->service);
-				info->service = NULL;
+				test_and_disconnect(session);
 			}
 		}
 
@@ -864,6 +881,7 @@ static void session_changed(struct connman_session *session,
 	case CONNMAN_SESSION_TRIGGER_CONNECT:
 		if (info->online == TRUE) {
 			info->reason = CONNMAN_SESSION_REASON_CONNECT;
+			__connman_service_session_inc(info->service);
 			break;
 		}
 
@@ -872,17 +890,16 @@ static void session_changed(struct connman_session *session,
 
 		break;
 	case CONNMAN_SESSION_TRIGGER_DISCONNECT:
-		if (info->online == FALSE)
-			break;
-
-		if (info->service != NULL)
-			__connman_service_disconnect(info->service);
-
-		info->reason = CONNMAN_SESSION_REASON_UNKNOWN;
-		info->service = NULL;
+		test_and_disconnect(session);
 
 		break;
 	case CONNMAN_SESSION_TRIGGER_PERIODIC:
+		if (info->online == TRUE) {
+			info->reason = CONNMAN_SESSION_REASON_PERIODIC;
+			__connman_service_session_inc(info->service);
+			break;
+		}
+
 		select_and_connect(session,
 				CONNMAN_SESSION_REASON_PERIODIC);
 
@@ -904,10 +921,8 @@ static void session_changed(struct connman_session *session,
 
 		break;
 	case CONNMAN_SESSION_TRIGGER_ECALL:
-		if (info->online == FALSE && info->service != NULL) {
-			info->reason = CONNMAN_SESSION_REASON_UNKNOWN;
-			info->service = NULL;
-		}
+		if (info->online == FALSE && info->service != NULL)
+			test_and_disconnect(session);
 
 		break;
 	}