Rename D-Bus helper for basic dictionary types

[framework/connectivity/connman.git] / include / dbus.h

diff --git a/include/dbus.h b/include/dbus.h
index 2b75d36..db681b9 100644 (file)
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -44,17 +44,27 @@ extern "C" {
 #define CONNMAN_NETWORK_INTERFACE      CONNMAN_SERVICE ".Network"
 #define CONNMAN_PROVIDER_INTERFACE     CONNMAN_SERVICE ".Provider"
 
-typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter);
+typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter,
+                                                       void *user_data);
 
 DBusConnection *connman_dbus_get_connection(void);
 
-void connman_dbus_property_append_variant(DBusMessageIter *property,
+void connman_dbus_property_append_basic(DBusMessageIter *iter,
                                        const char *key, int type, void *val);
+void connman_dbus_property_append_dict(DBusMessageIter *iter, const char *key,
+                       connman_dbus_append_cb_t function, void *user_data);
 void connman_dbus_property_append_fixed_array(DBusMessageIter *iter,
                                const char *key, int type, void *val, int len);
 void connman_dbus_property_append_variable_array(DBusMessageIter *dict,
                const char *key, int type, connman_dbus_append_cb_t function);
 
+dbus_bool_t connman_dbus_property_changed_basic(const char *path,
+                               const char *interface, const char *key,
+                                                       int type, void *val);
+dbus_bool_t connman_dbus_property_changed_dict(const char *path,
+                               const char *interface, const char *key,
+                       connman_dbus_append_cb_t function, void *user_data);
+
 static inline void connman_dbus_dict_open(DBusMessageIter *iter,
                                                        DBusMessageIter *dict)
 {
@@ -70,13 +80,50 @@ static inline void connman_dbus_dict_close(DBusMessageIter *iter,
        dbus_message_iter_close_container(iter, dict);
 }
 
-void connman_dbus_dict_append_variant(DBusMessageIter *dict,
-                                       const char *key, int type, void *val);
+static inline void connman_dbus_dict_append_basic(DBusMessageIter *dict,
+                                       const char *key, int type, void *val)
+{
+       DBusMessageIter entry;
 
-void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
-                               const char *key, int type, void *val, int len);
-void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
-               const char *key, int type, connman_dbus_append_cb_t function);
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                               NULL, &entry);
+       connman_dbus_property_append_basic(&entry, key, type, val);
+       dbus_message_iter_close_container(dict, &entry);
+}
+
+static inline void connman_dbus_dict_append_dict(DBusMessageIter *dict,
+                       const char *key, connman_dbus_append_cb_t function)
+{
+       DBusMessageIter entry;
+
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                               NULL, &entry);
+       connman_dbus_property_append_dict(&entry, key, function, NULL);
+       dbus_message_iter_close_container(dict, &entry);
+}
+
+static inline void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict,
+                               const char *key, int type, void *val, int len)
+{
+       DBusMessageIter entry;
+
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                               NULL, &entry);
+       connman_dbus_property_append_fixed_array(&entry, key, type, val, len);
+       dbus_message_iter_close_container(dict, &entry);
+}
+
+static inline void connman_dbus_dict_append_variable_array(DBusMessageIter *dict,
+               const char *key, int type, connman_dbus_append_cb_t function)
+{
+       DBusMessageIter entry;
+
+       dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+                                                               NULL, &entry);
+       connman_dbus_property_append_variable_array(&entry, key,
+                                                       type, function);
+       dbus_message_iter_close_container(dict, &entry);
+}
 
 dbus_bool_t connman_dbus_validate_ident(const char *ident);
 char *connman_dbus_encode_string(const char *value);