X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=fae3729b4065c24598667d63e74d8f391653a11b;hb=46d7e52dcabccff5e010a6aa7232fbbfea1abecb;hp=01e01f276297ec088c2672255e7c9f8941a26599;hpb=6c8213f23b60fb46e6cd2572a6adc7ce4da13691;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/service.c b/src/service.c
index 01e01f2..fae3729 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;
@@ -4718,7 +4786,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
@@ -5260,10 +5328,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);
 	}