X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=d6bd8705a0ec2edef23453777e43cc2997ae7ff4;hb=729e062d89d4ead006fa837675ed2d0d2b803ae2;hp=9e52dd394bb06319646c9cb7883c12fc75b7a76d;hpb=63416c37b9dba7536826ecdebdd4cab0af50d923;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/service.c b/src/service.c
index 9e52dd3..d6bd870 100644
--- a/src/service.c
+++ b/src/service.c
@@ -840,6 +840,74 @@ static connman_bool_t is_connected(struct connman_service *service)
 	return is_connected_state(service, service->state);
 }
 
+static const char *nameserver_get_ifname(struct connman_service *service)
+{
+	const char *ifname;
+
+	if (service->ipconfig_ipv4)
+		ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv4);
+	else if (service->ipconfig_ipv6)
+		ifname = __connman_ipconfig_get_ifname(service->ipconfig_ipv6);
+	else
+		ifname = NULL;
+
+	if (ifname == NULL)
+		return NULL;
+
+	switch (combine_state(service->state_ipv4, service->state_ipv6)) {
+	case CONNMAN_SERVICE_STATE_UNKNOWN:
+	case CONNMAN_SERVICE_STATE_IDLE:
+	case CONNMAN_SERVICE_STATE_ASSOCIATION:
+	case CONNMAN_SERVICE_STATE_CONFIGURATION:
+	case CONNMAN_SERVICE_STATE_FAILURE:
+	case CONNMAN_SERVICE_STATE_DISCONNECT:
+		return NULL;
+	case CONNMAN_SERVICE_STATE_READY:
+	case CONNMAN_SERVICE_STATE_ONLINE:
+		break;
+	}
+
+	return ifname;
+}
+
+static void remove_nameservers(struct connman_service *service,
+		const char* interface, char **ns)
+{
+	const char *ifname = interface;
+	int i;
+
+	if (ns == NULL)
+		return;
+
+	if (interface == NULL)
+		ifname = nameserver_get_ifname(service);
+
+	if (ifname == NULL)
+			return;
+
+	for (i = 0; ns[i] != NULL; i++)
+		connman_resolver_remove(ifname, NULL, ns[i]);
+}
+
+static void remove_searchdomains(struct connman_service *service,
+		const char *interface, char **sd)
+{
+	const char *ifname = interface;
+	int i;
+
+	if (sd == NULL)
+		return;
+
+	if (interface == NULL)
+		ifname = nameserver_get_ifname(service);
+
+	if (ifname == NULL)
+		return;
+
+	for (i = 0; sd[i] != NULL; i++)
+		connman_resolver_remove(ifname, sd[i], NULL);
+}
+
 static void update_nameservers(struct connman_service *service)
 {
 	const char *ifname;
@@ -872,25 +940,38 @@ static void update_nameservers(struct connman_service *service)
 	if (service->nameservers_config != NULL) {
 		int i;
 
-		for (i = 0; service->nameservers_config[i] != NULL; i++) {
+		remove_nameservers(service, ifname, service->nameservers);
+
+		i = g_strv_length(service->nameservers_config);
+		while (i != 0) {
+			i--;
 			connman_resolver_append(ifname, NULL,
-						service->nameservers_config[i]);
+					service->nameservers_config[i]);
 		}
 	} else if (service->nameservers != NULL) {
 		int i;
 
-		for (i = 0; service->nameservers[i] != NULL; i++) {
+		i = g_strv_length(service->nameservers);
+		while (i != 0) {
+			i--;
 			connman_resolver_append(ifname, NULL,
-						service->nameservers[i]);
+					service->nameservers[i]);
 		}
 	}
 
 	if (service->domains != NULL) {
+		char *searchdomains[2] = {NULL, NULL};
 		int i;
 
-		for (i = 0; service->domains[i]; i++)
+		searchdomains[0] = service->domainname;
+		remove_searchdomains(service, ifname, searchdomains);
+
+		i = g_strv_length(service->domains);
+		while (i != 0) {
+			i--;
 			connman_resolver_append(ifname,	service->domains[i],
 						NULL);
+		}
 	} else if (service->domainname != NULL)
 		connman_resolver_append(ifname, service->domainname, NULL);
 
@@ -1438,14 +1519,14 @@ static void append_ipv6config(DBusMessageIter *iter, void *user_data)
 							iter);
 }
 
-static void append_nameserver(DBusMessageIter *iter, char ***nameservers)
+static void append_nameservers(DBusMessageIter *iter, char **servers)
 {
-	char **servers;
 	int i;
 
-	servers = *nameservers;
+	DBG("%p", servers);
 
 	for (i = 0; servers[i] != NULL; i++) {
+		DBG("servers[%d] %s", i, servers[i]);
 		dbus_message_iter_append_basic(iter,
 					DBUS_TYPE_STRING, &servers[i]);
 	}
@@ -1459,30 +1540,25 @@ static void append_dns(DBusMessageIter *iter, void *user_data)
 		return;
 
 	if (service->nameservers_config != NULL) {
-		append_nameserver(iter, &service->nameservers_config);
+		append_nameservers(iter, service->nameservers_config);
 		return;
 	} else {
 		if (service->nameservers != NULL)
-			append_nameserver(iter, &service->nameservers);
+			append_nameservers(iter, service->nameservers);
 
 		if (service->nameservers_auto != NULL)
-			append_nameserver(iter, &service->nameservers_auto);
+			append_nameservers(iter, service->nameservers_auto);
 	}
 }
 
 static void append_dnsconfig(DBusMessageIter *iter, void *user_data)
 {
 	struct connman_service *service = user_data;
-	int i;
 
 	if (service->nameservers_config == NULL)
 		return;
 
-	for (i = 0; service->nameservers_config[i]; i++) {
-		dbus_message_iter_append_basic(iter,
-				DBUS_TYPE_STRING,
-				&service->nameservers_config[i]);
-	}
+	append_nameservers(iter, service->nameservers_config);
 }
 
 static void append_ts(DBusMessageIter *iter, void *user_data)
@@ -1515,32 +1591,32 @@ static void append_tsconfig(DBusMessageIter *iter, void *user_data)
 	}
 }
 
-static void append_domain(DBusMessageIter *iter, void *user_data)
+static void append_domainconfig(DBusMessageIter *iter, void *user_data)
 {
 	struct connman_service *service = user_data;
+	int i;
 
-	if (is_connected(service) == FALSE &&
-				is_connecting(service) == FALSE)
-		return;
-
-	if (service->domainname == NULL)
+	if (service->domains == NULL)
 		return;
 
-	dbus_message_iter_append_basic(iter,
-				DBUS_TYPE_STRING, &service->domainname);
+	for (i = 0; service->domains[i]; i++)
+		dbus_message_iter_append_basic(iter,
+				DBUS_TYPE_STRING, &service->domains[i]);
 }
 
-static void append_domainconfig(DBusMessageIter *iter, void *user_data)
+static void append_domain(DBusMessageIter *iter, void *user_data)
 {
 	struct connman_service *service = user_data;
-	int i;
 
-	if (service->domains == NULL)
+	if (is_connected(service) == FALSE &&
+				is_connecting(service) == FALSE)
 		return;
 
-	for (i = 0; service->domains[i]; i++)
+	if (service->domains != NULL)
+		append_domainconfig(iter, user_data);
+	else if (service->domainname != NULL)
 		dbus_message_iter_append_basic(iter,
-				DBUS_TYPE_STRING, &service->domains[i]);
+				DBUS_TYPE_STRING, &service->domainname);
 }
 
 static void append_proxies(DBusMessageIter *iter, void *user_data)
@@ -2954,6 +3030,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 				g_string_append(str, val);
 		}
 
+		remove_nameservers(service, NULL, service->nameservers_config);
 		g_strfreev(service->nameservers_config);
 
 		if (str->len > 0) {
@@ -3037,6 +3114,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 				g_string_append(str, val);
 		}
 
+		remove_searchdomains(service, NULL, service->domains);
 		g_strfreev(service->domains);
 
 		if (str->len > 0)
@@ -3811,22 +3889,34 @@ static void service_schedule_removed(struct connman_service *service)
 	service_schedule_changed();
 }
 
-static GDBusMethodTable service_methods[] = {
-	{ "GetProperties", "",   "a{sv}", get_properties     },
-	{ "SetProperty",   "sv", "",      set_property       },
-	{ "ClearProperty", "s",  "",      clear_property     },
-	{ "Connect",       "",   "",      connect_service,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "Disconnect",    "",   "",      disconnect_service },
-	{ "Remove",        "",   "",      remove_service     },
-	{ "MoveBefore",    "o",  "",      move_before        },
-	{ "MoveAfter",     "o",  "",      move_after         },
-	{ "ResetCounters", "",   "",      reset_counters     },
+static const GDBusMethodTable service_methods[] = {
+	{ GDBUS_DEPRECATED_METHOD("GetProperties",
+			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			get_properties) },
+	{ GDBUS_METHOD("SetProperty",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+			NULL, set_property) },
+	{ GDBUS_METHOD("ClearProperty",
+			GDBUS_ARGS({ "name", "s" }), NULL,
+			clear_property) },
+	{ GDBUS_ASYNC_METHOD("Connect", NULL, NULL,
+			      connect_service) },
+	{ GDBUS_METHOD("Disconnect", NULL, NULL,
+			disconnect_service) },
+	{ GDBUS_METHOD("Remove", NULL, NULL, remove_service) },
+	{ GDBUS_METHOD("MoveBefore",
+			GDBUS_ARGS({ "service", "o" }), NULL,
+			move_before) },
+	{ GDBUS_METHOD("MoveAfter",
+			GDBUS_ARGS({ "service", "o" }), NULL,
+			move_after) },
+	{ GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
 	{ },
 };
 
-static GDBusSignalTable service_signals[] = {
-	{ "PropertyChanged", "sv" },
+static const GDBusSignalTable service_signals[] = {
+	{ GDBUS_SIGNAL("PropertyChanged",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
 	{ },
 };
 
@@ -4706,7 +4796,7 @@ static int service_indicate_state(struct connman_service *service)
 		if (service->userconnect == TRUE &&
 			__connman_agent_report_error(service,
 					error2string(service->error),
-					report_error_cb, NULL) == -EIO)
+					report_error_cb, NULL) == -EINPROGRESS)
 			return 0;
 		service_complete(service);
 	} else
@@ -4762,7 +4852,7 @@ int __connman_service_clear_error(struct connman_service *service)
 
 	service->state_ipv4 = service->state_ipv6 =
 						CONNMAN_SERVICE_STATE_UNKNOWN;
-	service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;;
+	service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
 
 	if (service->favorite == TRUE)
 		set_reconnect_state(service, TRUE);
@@ -5240,13 +5330,6 @@ int __connman_service_connect(struct connman_service *service)
 		return -EINPROGRESS;
 	}
 
-	__connman_service_ipconfig_indicate_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE,
-					CONNMAN_IPCONFIG_TYPE_IPV4);
-	__connman_service_ipconfig_indicate_state(service,
-					CONNMAN_SERVICE_STATE_FAILURE,
-					CONNMAN_IPCONFIG_TYPE_IPV6);
-
 	if (service->network != NULL)
 		__connman_network_disconnect(service->network);
 	else if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
@@ -5255,10 +5338,8 @@ int __connman_service_connect(struct connman_service *service)
 
 	if (service->userconnect == TRUE) {
 		if (err == -ENOKEY || err == -EPERM) {
-			if (__connman_agent_request_passphrase_input(service,
-							request_input_cb,
-							NULL) == -EIO)
-				return -EINPROGRESS;
+			return __connman_agent_request_passphrase_input(service,
+					request_input_cb, NULL);
 		}
 		reply_pending(service, -err);
 	}
@@ -5924,7 +6005,7 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne
 
 	if (service->favorite == TRUE) {
 		device = connman_network_get_device(service->network);
-		if (device && __connman_device_scanning(device) == FALSE)
+		if (device && connman_device_get_scanning(device) == FALSE)
 			__connman_service_auto_connect();
 	}