From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Wed, 24 Aug 2011 14:02:01 +0000 (+0300)
Subject: service: Fix state combining
X-Git-Tag: 2.0_alpha~1170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=269cadfb020711762a2580ed92b242b5b3150677;p=framework%2Fconnectivity%2Fconnman.git

service: Fix state combining

If we have IPv6 state as DISCONNECT and IPv4 state as
ONLINE or READY then we are not disconnected.
---

diff --git a/src/service.c b/src/service.c
index 62ad20a..de6541d 100644
--- a/src/service.c
+++ b/src/service.c
@@ -743,75 +743,43 @@ static enum connman_service_state combine_state(
 		goto done;
 	}
 
-	if (state_a == CONNMAN_SERVICE_STATE_ASSOCIATION) {
-		if (state_b == CONNMAN_SERVICE_STATE_CONFIGURATION ||
-				state_b == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_b == CONNMAN_SERVICE_STATE_READY)
-			result = state_b;
-		else
-			result = state_a;
+	if (state_a == CONNMAN_SERVICE_STATE_ONLINE) {
+		result = state_a;
 		goto done;
 	}
 
-	if (state_b == CONNMAN_SERVICE_STATE_ASSOCIATION) {
-		if (state_a == CONNMAN_SERVICE_STATE_CONFIGURATION ||
-				state_a == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_a == CONNMAN_SERVICE_STATE_READY)
-			result = state_a;
-		else
-			result = state_b;
+	if (state_b == CONNMAN_SERVICE_STATE_ONLINE) {
+		result = state_b;
 		goto done;
 	}
 
-	if (state_a == CONNMAN_SERVICE_STATE_CONFIGURATION) {
-		if (state_b == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_b == CONNMAN_SERVICE_STATE_READY)
-			result = state_b;
-		else
-			result = state_a;
+	if (state_a == CONNMAN_SERVICE_STATE_READY) {
+		result = state_a;
 		goto done;
 	}
 
-	if (state_b == CONNMAN_SERVICE_STATE_CONFIGURATION) {
-		if (state_a == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_a == CONNMAN_SERVICE_STATE_READY)
-			result = state_a;
-		else
-			result = state_b;
+	if (state_b == CONNMAN_SERVICE_STATE_READY) {
+		result = state_b;
 		goto done;
 	}
 
-	if (state_a == CONNMAN_SERVICE_STATE_READY) {
-		if (state_b == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
-			result = state_b;
-		else
-			result = state_a;
+	if (state_a == CONNMAN_SERVICE_STATE_CONFIGURATION) {
+		result = state_a;
 		goto done;
 	}
 
-	if (state_b == CONNMAN_SERVICE_STATE_READY) {
-		if (state_a == CONNMAN_SERVICE_STATE_ONLINE ||
-				state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
-			result = state_a;
-		else
-			result = state_b;
+	if (state_b == CONNMAN_SERVICE_STATE_CONFIGURATION) {
+		result = state_b;
 		goto done;
 	}
 
-	if (state_a == CONNMAN_SERVICE_STATE_ONLINE) {
-		if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
-			result = state_b;
-		else
-			result = state_a;
+	if (state_a == CONNMAN_SERVICE_STATE_ASSOCIATION) {
+		result = state_a;
 		goto done;
 	}
 
-	if (state_b == CONNMAN_SERVICE_STATE_ONLINE) {
-		if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
-			result = state_a;
-		else
-			result = state_b;
+	if (state_b == CONNMAN_SERVICE_STATE_ASSOCIATION) {
+		result = state_b;
 		goto done;
 	}