service: Remove unnecessary setting of ipconfing to failure

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

diff --git a/src/service.c b/src/service.c
index 595a377..01e01f2 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1515,32 +1515,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,22 +3812,33 @@ static void service_schedule_removed(struct connman_service *service)
 }
 
 static const GDBusMethodTable service_methods[] = {
-       { "GetProperties", "",   "a{sv}", get_properties,
-                                               G_DBUS_METHOD_FLAG_DEPRECATED },
-       { "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     },
+       { 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 const GDBusSignalTable service_signals[] = {
-       { "PropertyChanged", "sv" },
+       { GDBUS_SIGNAL("PropertyChanged",
+                       GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
        { },
 };
 
@@ -5241,13 +5252,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 &&
@@ -5925,7 +5929,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();
        }