Don't allow remove method calls on non-favorite services

[connman] / src / service.c

diff --git a/src/service.c b/src/service.c
index c3d4e20..a6ee992 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -174,14 +174,14 @@ static void state_changed(struct connman_service *service)
 }
 
 static DBusMessage *get_properties(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
        DBusMessage *reply;
        DBusMessageIter array, dict;
        const char *str;
 
-       DBG("conn %p", conn);
+       DBG("service %p", service);
 
        reply = dbus_message_new_method_return(msg);
        if (reply == NULL)
@@ -237,14 +237,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
 }
 
 static DBusMessage *set_property(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
        DBusMessageIter iter, value;
        const char *name;
        int type;
 
-       DBG("conn %p", conn);
+       DBG("service %p", service);
 
        if (dbus_message_iter_init(msg, &iter) == FALSE)
                return __connman_error_invalid_arguments(msg);
@@ -292,6 +292,9 @@ static gboolean connect_timeout(gpointer user_data)
 
        service->timeout = 0;
 
+       if (service->network != NULL)
+               __connman_network_disconnect(service->network);
+
        if (service->pending != NULL) {
                DBusMessage *reply;
 
@@ -301,15 +304,20 @@ static gboolean connect_timeout(gpointer user_data)
 
                dbus_message_unref(service->pending);
                service->pending = NULL;
+
+               __connman_service_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_FAILURE);
        }
 
        return FALSE;
 }
 
 static DBusMessage *connect_service(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
+
+       DBG("service %p", service);
 
        if (service->pending != NULL)
                return __connman_error_in_progress(msg);
@@ -351,9 +359,11 @@ static DBusMessage *connect_service(DBusConnection *conn,
 }
 
 static DBusMessage *disconnect_service(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
+
+       DBG("service %p", service);
 
        if (service->pending != NULL) {
                DBusMessage *reply;
@@ -369,8 +379,13 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
        }
 
        if (service->network != NULL) {
+               struct connman_device *device;
                int err;
 
+               device = connman_network_get_device(service->network);
+               if (device != NULL)
+                       __connman_device_disconnect(device);
+
                err = __connman_network_disconnect(service->network);
                if (err < 0 && err != -EINPROGRESS)
                        return __connman_error_failed(msg, -err);
@@ -393,19 +408,26 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
 }
 
 static DBusMessage *remove_service(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
+
+       DBG("service %p", service);
 
        if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET)
                return __connman_error_not_supported(msg);
 
+       if (service->favorite == FALSE)
+               return __connman_error_not_supported(msg);
+
        if (service->network != NULL) {
-               int err;
+               struct connman_device *device;
 
-               err = __connman_network_disconnect(service->network);
-               if (err < 0 && err != -EINPROGRESS)
-                       return __connman_error_failed(msg, -err);
+               device = connman_network_get_device(service->network);
+               if (device != NULL)
+                       __connman_device_disconnect(device);
+
+               __connman_network_disconnect(service->network);
        }
 
        connman_service_set_favorite(service, FALSE);
@@ -415,9 +437,11 @@ static DBusMessage *remove_service(DBusConnection *conn,
 }
 
 static DBusMessage *move_before(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
+
+       DBG("service %p", service);
 
        if (service->favorite == FALSE)
                return __connman_error_not_supported(msg);
@@ -426,9 +450,11 @@ static DBusMessage *move_before(DBusConnection *conn,
 }
 
 static DBusMessage *move_after(DBusConnection *conn,
-                                       DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
+
+       DBG("service %p", service);
 
        if (service->favorite == FALSE)
                return __connman_error_not_supported(msg);
@@ -453,9 +479,9 @@ static GDBusSignalTable service_signals[] = {
        { },
 };
 
-static void service_free(gpointer data)
+static void service_free(gpointer user_data)
 {
-       struct connman_service *service = data;
+       struct connman_service *service = user_data;
        char *path = service->path;
 
        DBG("service %p", service);
@@ -491,12 +517,12 @@ static void service_free(gpointer data)
 }
 
 /**
- * connman_service_put:
+ * __connman_service_put:
  * @service: service structure
  *
  * Release service if no longer needed
  */
-void connman_service_put(struct connman_service *service)
+void __connman_service_put(struct connman_service *service)
 {
        DBG("service %p", service);
 
@@ -570,7 +596,7 @@ struct connman_service *connman_service_ref(struct connman_service *service)
  */
 void connman_service_unref(struct connman_service *service)
 {
-       connman_service_put(service);
+       __connman_service_put(service);
 }
 
 static gint service_compare(gconstpointer a, gconstpointer b,
@@ -579,6 +605,13 @@ static gint service_compare(gconstpointer a, gconstpointer b,
        struct connman_service *service_a = (void *) a;
        struct connman_service *service_b = (void *) b;
 
+       if (service_a->state != service_b->state) {
+               if (service_a->state == CONNMAN_SERVICE_STATE_READY)
+                       return -1;
+               if (service_b->state == CONNMAN_SERVICE_STATE_READY)
+                       return 1;
+       }
+
        if (service_a->order > service_b->order)
                return -1;
 
@@ -610,7 +643,7 @@ int connman_service_set_favorite(struct connman_service *service,
        if (iter == NULL)
                return -ENOENT;
 
-       if (service->favorite)
+       if (service->favorite == favorite)
                return -EALREADY;
 
        service->favorite = favorite;
@@ -656,6 +689,8 @@ int __connman_service_set_carrier(struct connman_service *service,
 int __connman_service_indicate_state(struct connman_service *service,
                                        enum connman_service_state state)
 {
+       GSequenceIter *iter;
+
        DBG("service %p state %d", service, state);
 
        if (service == NULL)
@@ -694,7 +729,6 @@ int __connman_service_indicate_state(struct connman_service *service,
                        dbus_message_unref(service->pending);
                        service->pending = NULL;
                }
-
        }
 
        if (state == CONNMAN_SERVICE_STATE_FAILURE) {
@@ -711,18 +745,27 @@ int __connman_service_indicate_state(struct connman_service *service,
                        dbus_message_unref(service->pending);
                        service->pending = NULL;
                }
+
+               service->state = CONNMAN_SERVICE_STATE_IDLE;
+               state_changed(service);
        }
 
+       iter = g_hash_table_lookup(service_hash, service->identifier);
+       if (iter != NULL)
+               g_sequence_sort_changed(iter, service_compare, NULL);
+
+       __connman_profile_changed();
+
        return 0;
 }
 
 /**
- * connman_service_lookup:
+ * __connman_service_lookup:
  * @identifier: service identifier
  *
  * Look up a service by identifier (reference count will not be increased)
  */
-struct connman_service *connman_service_lookup(const char *identifier)
+static struct connman_service *__connman_service_lookup(const char *identifier)
 {
        GSequenceIter *iter;
 
@@ -734,12 +777,12 @@ struct connman_service *connman_service_lookup(const char *identifier)
 }
 
 /**
- * connman_service_get:
+ * __connman_service_get:
  * @identifier: service identifier
  *
  * Look up a service by identifier or create a new one if not found
  */
-struct connman_service *connman_service_get(const char *identifier)
+static struct connman_service *__connman_service_get(const char *identifier)
 {
        struct connman_service *service;
        GSequenceIter *iter;
@@ -777,6 +820,7 @@ struct connman_service *connman_service_get(const char *identifier)
 static int service_register(struct connman_service *service)
 {
        const char *path = __connman_profile_active_path();
+       GSequenceIter *iter;
 
        DBG("service %p", service);
 
@@ -792,6 +836,12 @@ static int service_register(struct connman_service *service)
                                        service_methods, service_signals,
                                                        NULL, service, NULL);
 
+       __connman_storage_load_service(service);
+
+       iter = g_hash_table_lookup(service_hash, service->identifier);
+       if (iter != NULL)
+               g_sequence_sort_changed(iter, service_compare, NULL);
+
        __connman_profile_changed();
 
        return 0;
@@ -816,7 +866,7 @@ struct connman_service *__connman_service_lookup_from_device(struct connman_devi
        name = g_strdup_printf("%s_%s",
                                __connman_device_get_type(device), ident);
 
-       service = connman_service_lookup(name);
+       service = __connman_service_lookup(name);
 
        g_free(name);
 
@@ -865,12 +915,12 @@ struct connman_service *__connman_service_create_from_device(struct connman_devi
        name = g_strdup_printf("%s_%s",
                                __connman_device_get_type(device), ident);
 
-       service = connman_service_get(name);
+       service = __connman_service_get(name);
        if (service == NULL)
                goto done;
 
        if (service->path != NULL) {
-               connman_service_put(service);
+               __connman_service_put(service);
                service = NULL;
                goto done;
        }
@@ -910,7 +960,7 @@ struct connman_service *__connman_service_lookup_from_network(struct connman_net
        name = g_strdup_printf("%s_%s_%s",
                        __connman_network_get_type(network), ident, group);
 
-       service = connman_service_lookup(name);
+       service = __connman_service_lookup(name);
 
        g_free(name);
 
@@ -1029,7 +1079,7 @@ struct connman_service *__connman_service_create_from_network(struct connman_net
        name = g_strdup_printf("%s_%s_%s",
                        __connman_network_get_type(network), ident, group);
 
-       service = connman_service_get(name);
+       service = __connman_service_get(name);
        if (service == NULL)
                goto done;
 
@@ -1038,13 +1088,15 @@ struct connman_service *__connman_service_create_from_network(struct connman_net
 
                __connman_profile_changed();
 
-               connman_service_put(service);
+               __connman_service_put(service);
                service = NULL;
                goto done;
        }
 
        service->type = convert_network_type(network);
 
+       service->state = CONNMAN_SERVICE_STATE_IDLE;
+
        update_from_network(service, network);
 
        service_register(service);
@@ -1140,6 +1192,10 @@ static int service_save(struct connman_service *service)
        g_free(data);
 
 update:
+       if (service->name != NULL)
+               g_key_file_set_string(keyfile, service->identifier,
+                                               "Name", service->name);
+
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
        case CONNMAN_SERVICE_TYPE_ETHERNET: