Add user data to D-Bus helper function callbacks

[platform/upstream/connman.git] / src / device.c

diff --git a/src/device.c b/src/device.c
index fde5fd6..05e27ab 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -193,30 +193,11 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
        return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
-static int powered_changed(struct connman_device *device)
+static void powered_changed(struct connman_device *device)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "Powered";
-
-       signal = dbus_message_new_signal(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return -ENOMEM;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
-                                                       &device->powered);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
-
-       return 0;
+       connman_dbus_property_changed_basic(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "Powered",
+                                       DBUS_TYPE_BOOLEAN, &device->powered);
 }
 
 static int set_powered(struct connman_device *device, connman_bool_t powered)
@@ -271,6 +252,11 @@ static int set_powered(struct connman_device *device, connman_bool_t powered)
        return err;
 }
 
+void __connman_device_list(DBusMessageIter *iter, void *user_data)
+{
+       __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, iter);
+}
+
 static void append_path(gpointer key, gpointer value, gpointer user_data)
 {
        struct connman_element *element = value;
@@ -320,10 +306,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
 
        dbus_message_iter_init_append(reply, &array);
 
-       dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
-                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
-                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+       connman_dbus_dict_open(&array, &dict);
 
        if (device->name != NULL)
                connman_dbus_dict_append_variant(&dict, "Name",
@@ -365,7 +348,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
                break;
        }
 
-       dbus_message_iter_close_container(&array, &dict);
+       connman_dbus_dict_close(&array, &dict);
 
        return reply;
 }
@@ -510,38 +493,19 @@ static GDBusSignalTable device_signals[] = {
        { },
 };
 
-static void append_devices(DBusMessageIter *entry)
-{
-       DBusMessageIter value, iter;
-       const char *key = "Devices";
-
-       dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
-               DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
-                                                               &value);
-
-       dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
-                               DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-       __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
-       dbus_message_iter_close_container(&value, &iter);
-
-       dbus_message_iter_close_container(entry, &value);
-}
-
 static void emit_devices_signal(void)
 {
        DBusMessage *signal;
-       DBusMessageIter entry;
+       DBusMessageIter iter;
 
        signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
                                CONNMAN_MANAGER_INTERFACE, "PropertyChanged");
        if (signal == NULL)
                return;
 
-       dbus_message_iter_init_append(signal, &entry);
-
-       append_devices(&entry);
+       dbus_message_iter_init_append(signal, &iter);
+       connman_dbus_property_append_variable_array(&iter, "Devices",
+                               DBUS_TYPE_OBJECT_PATH, __connman_device_list);
 
        g_dbus_send_message(connection, signal);
 }
@@ -1267,26 +1231,9 @@ void __connman_device_cleanup_networks(struct connman_device *device)
 
 static void scanning_changed(struct connman_device *device)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "Scanning";
-
-       signal = dbus_message_new_signal(device->element.path,
-                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
-                                                       &device->scanning);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "Scanning",
+                                       DBUS_TYPE_BOOLEAN, &device->scanning);
 }
 
 static void mark_network_available(gpointer key, gpointer value,
@@ -1732,7 +1679,7 @@ static int device_load(struct connman_device *device)
 
        DBG("device %p", device);
 
-       keyfile = __connman_storage_open(ident);
+       keyfile = __connman_storage_open_profile(ident);
        if (keyfile == NULL)
                return 0;
 
@@ -1762,7 +1709,7 @@ static int device_load(struct connman_device *device)
 done:
        g_free(identifier);
 
-       __connman_storage_close(ident, keyfile, FALSE);
+       __connman_storage_close_profile(ident, keyfile, FALSE);
 
        return 0;
 }
@@ -1775,7 +1722,7 @@ static int device_save(struct connman_device *device)
 
        DBG("device %p", device);
 
-       keyfile = __connman_storage_open(ident);
+       keyfile = __connman_storage_open_profile(ident);
        if (keyfile == NULL)
                return 0;
 
@@ -1800,7 +1747,7 @@ static int device_save(struct connman_device *device)
 done:
        g_free(identifier);
 
-       __connman_storage_close(ident, keyfile, TRUE);
+       __connman_storage_close_profile(ident, keyfile, TRUE);
 
        return 0;
 }