From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Date: Wed, 14 Mar 2012 15:28:50 +0000 (+0200)
Subject: connection: Trigger service updates only after setting gateways
X-Git-Tag: 0.80~129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2f04c2e58b9b6748858f745985efd10ce58be87;p=platform%2Fupstream%2Fconnman.git

connection: Trigger service updates only after setting gateways

This is needed so that gateways are set properly when service
triggers online checks.
---

diff --git a/src/connection.c b/src/connection.c
index d57cf62..a27206d 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -547,6 +547,8 @@ int __connman_connection_gateway_add(struct connman_service *service,
 {
 	struct gateway_data *active_gateway = NULL;
 	struct gateway_data *new_gateway = NULL;
+	enum connman_ipconfig_type type4 = CONNMAN_IPCONFIG_TYPE_UNKNOWN,
+		type6 = CONNMAN_IPCONFIG_TYPE_UNKNOWN;
 	int index;
 
 	index = __connman_service_get_index(service);
@@ -593,18 +595,14 @@ int __connman_connection_gateway_add(struct connman_service *service,
 				new_gateway->ipv4_gateway != NULL) {
 		__connman_service_nameserver_add_routes(service,
 					new_gateway->ipv4_gateway->gateway);
-		__connman_service_ipconfig_indicate_state(service,
-						CONNMAN_SERVICE_STATE_READY,
-						CONNMAN_IPCONFIG_TYPE_IPV4);
+		type4 = CONNMAN_IPCONFIG_TYPE_IPV4;
 	}
 
 	if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
 				new_gateway->ipv6_gateway != NULL) {
 		__connman_service_nameserver_add_routes(service,
 					new_gateway->ipv6_gateway->gateway);
-		__connman_service_ipconfig_indicate_state(service,
-						CONNMAN_SERVICE_STATE_READY,
-						CONNMAN_IPCONFIG_TYPE_IPV6);
+		type6 = CONNMAN_IPCONFIG_TYPE_IPV6;
 	}
 
 	if (connman_service_get_type(service) == CONNMAN_SERVICE_TYPE_VPN) {
@@ -677,7 +675,7 @@ int __connman_connection_gateway_add(struct connman_service *service,
 
 	if (active_gateway == NULL) {
 		set_default_gateway(new_gateway, type);
-		return 0;
+		goto done;
 	}
 
 	if (type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
@@ -700,6 +698,16 @@ int __connman_connection_gateway_add(struct connman_service *service,
 					active_gateway->ipv6_gateway->gateway);
 	}
 
+done:
+	if (type4 == CONNMAN_IPCONFIG_TYPE_IPV4)
+		__connman_service_ipconfig_indicate_state(service,
+						CONNMAN_SERVICE_STATE_READY,
+						CONNMAN_IPCONFIG_TYPE_IPV4);
+
+	if (type6 == CONNMAN_IPCONFIG_TYPE_IPV6)
+		__connman_service_ipconfig_indicate_state(service,
+						CONNMAN_SERVICE_STATE_READY,
+						CONNMAN_IPCONFIG_TYPE_IPV6);
 	return 0;
 }