service: Add helpers for removing nameservers and search domains

[framework/connectivity/connman.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 84a1124..fae3729 100644 (file)
--- 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;
@@ -1515,32 +1583,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)
@@ -3812,32 +3880,32 @@ static void service_schedule_removed(struct connman_service *service)
 }
 
 static const GDBusMethodTable service_methods[] = {
-       { _GDBUS_DEPRECATED_METHOD("GetProperties", "", "a{sv}",
+       { GDBUS_DEPRECATED_METHOD("GetProperties",
                        NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
                        get_properties) },
-       { _GDBUS_METHOD("SetProperty", "sv", "",
+       { GDBUS_METHOD("SetProperty",
                        GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
                        NULL, set_property) },
-       { _GDBUS_METHOD("ClearProperty", "s", "",
+       { GDBUS_METHOD("ClearProperty",
                        GDBUS_ARGS({ "name", "s" }), NULL,
                        clear_property) },
-       { _GDBUS_ASYNC_METHOD("Connect", "", "", NULL, NULL,
+       { GDBUS_ASYNC_METHOD("Connect", NULL, NULL,
                              connect_service) },
-       { _GDBUS_METHOD("Disconnect", "", "", NULL, NULL,
+       { GDBUS_METHOD("Disconnect", NULL, NULL,
                        disconnect_service) },
-       { _GDBUS_METHOD("Remove", "", "", NULL, NULL, remove_service) },
-       { _GDBUS_METHOD("MoveBefore", "o", "",
+       { GDBUS_METHOD("Remove", NULL, NULL, remove_service) },
+       { GDBUS_METHOD("MoveBefore",
                        GDBUS_ARGS({ "service", "o" }), NULL,
                        move_before) },
-       { _GDBUS_METHOD("MoveAfter", "o", "",
+       { GDBUS_METHOD("MoveAfter",
                        GDBUS_ARGS({ "service", "o" }), NULL,
                        move_after) },
-       { _GDBUS_METHOD("ResetCounters", "", "", NULL, NULL, reset_counters) },
+       { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
        { },
 };
 
 static const GDBusSignalTable service_signals[] = {
-       { _GDBUS_SIGNAL("PropertyChanged", "sv",
+       { GDBUS_SIGNAL("PropertyChanged",
                        GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
        { },
 };
@@ -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
@@ -5252,13 +5320,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 &&
@@ -5267,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);
        }
@@ -5936,7 +5995,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();
        }