X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdbus.c;h=38a6b92feda817279ff8b159973080454748c2d3;hb=39c1cfe1013d5731f64407881ddf3dc16942063a;hp=c025979adb3edfff5abb0c36f0972bfaa3e3769b;hpb=0c87b66b1687f815151bc9303ba6ae4dad09d93a;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/dbus.c b/src/dbus.c index c025979..38a6b92 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -24,7 +24,7 @@ #endif #include -#include +#include #include "connman.h" @@ -74,7 +74,7 @@ char *connman_dbus_encode_string(const char *value) return g_string_free(str, FALSE); } -void connman_dbus_property_append_variant(DBusMessageIter *iter, +void connman_dbus_property_append_basic(DBusMessageIter *iter, const char *key, int type, void *val) { DBusMessageIter value; @@ -104,6 +104,12 @@ void connman_dbus_property_append_variant(DBusMessageIter *iter, case DBUS_TYPE_INT32: signature = DBUS_TYPE_INT32_AS_STRING; break; + case DBUS_TYPE_UINT64: + signature = DBUS_TYPE_UINT64_AS_STRING; + break; + case DBUS_TYPE_INT64: + signature = DBUS_TYPE_INT64_AS_STRING; + break; case DBUS_TYPE_OBJECT_PATH: signature = DBUS_TYPE_OBJECT_PATH_AS_STRING; break; @@ -118,23 +124,31 @@ void connman_dbus_property_append_variant(DBusMessageIter *iter, dbus_message_iter_close_container(iter, &value); } -void connman_dbus_dict_append_variant(DBusMessageIter *dict, - 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) { - DBusMessageIter entry; + DBusMessageIter value, dict; - dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, - NULL, &entry); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &key); - connman_dbus_property_append_variant(&entry, key, type, val); + dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &value); + + connman_dbus_dict_open(&value, &dict); + if (function) + function(&dict, user_data); + connman_dbus_dict_close(&value, &dict); - dbus_message_iter_close_container(dict, &entry); + dbus_message_iter_close_container(iter, &value); } -void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict, +void connman_dbus_property_append_fixed_array(DBusMessageIter *iter, const char *key, int type, void *val, int len) { - DBusMessageIter entry, value, array; + DBusMessageIter value, array; const char *variant_sig, *array_sig; switch (type) { @@ -146,12 +160,9 @@ void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict, return; } - dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, - NULL, &entry); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &key); - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, + dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, variant_sig, &value); dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, @@ -159,15 +170,14 @@ void connman_dbus_dict_append_fixed_array(DBusMessageIter *dict, dbus_message_iter_append_fixed_array(&array, type, val, len); dbus_message_iter_close_container(&value, &array); - dbus_message_iter_close_container(&entry, &value); - - dbus_message_iter_close_container(dict, &entry); + dbus_message_iter_close_container(iter, &value); } -void connman_dbus_dict_append_variable_array(DBusMessageIter *dict, - const char *key, int type, connman_dbus_append_cb_t function) +void connman_dbus_property_append_array(DBusMessageIter *iter, + const char *key, int type, + connman_dbus_append_cb_t function, void *user_data) { - DBusMessageIter entry, value, array; + DBusMessageIter value, array; const char *variant_sig, *array_sig; switch (type) { @@ -183,27 +193,201 @@ void connman_dbus_dict_append_variable_array(DBusMessageIter *dict, return; } - dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, - NULL, &entry); - - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &key); - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, + dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, variant_sig, &value); dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, array_sig, &array); if (function) - function(&array); + function(&array, user_data); dbus_message_iter_close_container(&value, &array); - dbus_message_iter_close_container(&entry, &value); - - dbus_message_iter_close_container(dict, &entry); + dbus_message_iter_close_container(iter, &value); } static DBusConnection *connection = NULL; +dbus_bool_t connman_dbus_property_changed_basic(const char *path, + const char *interface, const char *key, + int type, void *val) +{ + DBusMessage *signal; + DBusMessageIter iter; + + if (path == NULL) + return FALSE; + + signal = dbus_message_new_signal(path, interface, "PropertyChanged"); + if (signal == NULL) + return FALSE; + + dbus_message_iter_init_append(signal, &iter); + connman_dbus_property_append_basic(&iter, key, type, val); + + g_dbus_send_message(connection, signal); + + return TRUE; +} + +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) +{ + DBusMessage *signal; + DBusMessageIter iter; + + if (path == NULL) + return FALSE; + + signal = dbus_message_new_signal(path, interface, "PropertyChanged"); + if (signal == NULL) + return FALSE; + + dbus_message_iter_init_append(signal, &iter); + connman_dbus_property_append_dict(&iter, key, function, user_data); + + g_dbus_send_message(connection, signal); + + return TRUE; +} + +dbus_bool_t connman_dbus_property_changed_array(const char *path, + const char *interface, const char *key, int type, + connman_dbus_append_cb_t function, void *user_data) +{ + DBusMessage *signal; + DBusMessageIter iter; + + if (path == NULL) + return FALSE; + + signal = dbus_message_new_signal(path, interface, "PropertyChanged"); + if (signal == NULL) + return FALSE; + + dbus_message_iter_init_append(signal, &iter); + connman_dbus_property_append_array(&iter, key, type, + function, user_data); + + g_dbus_send_message(connection, signal); + + return TRUE; +} + +dbus_bool_t connman_dbus_setting_changed_basic(const char *owner, + const char *path, const char *key, + int type, void *val) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_basic(&dict, key, type, val); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t connman_dbus_setting_changed_dict(const char *owner, + const char *path, const char *key, + connman_dbus_append_cb_t function, + void *user_data) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_dict(&dict, key, function, user_data); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t connman_dbus_setting_changed_array(const char *owner, + const char *path, const char *key, int type, + connman_dbus_append_cb_t function, + void *user_data) +{ + DBusMessage *msg; + DBusMessageIter array, dict; + + if (owner == NULL || path == NULL) + return FALSE; + + msg = dbus_message_new_method_call(owner, path, + CONNMAN_NOTIFICATION_INTERFACE, + "Update"); + if (msg == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &array); + connman_dbus_dict_open(&array, &dict); + + connman_dbus_dict_append_array(&dict, key, type, function, user_data); + + connman_dbus_dict_close(&array, &dict); + + g_dbus_send_message(connection, msg); + + return TRUE; +} + +dbus_bool_t __connman_dbus_append_objpath_dict_array(DBusMessage *msg, + connman_dbus_append_cb_t function, void *user_data) +{ + DBusMessageIter iter, array; + + if (msg == NULL || function == NULL) + return FALSE; + + dbus_message_iter_init_append(msg, &iter); + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + DBUS_STRUCT_BEGIN_CHAR_AS_STRING + DBUS_TYPE_OBJECT_PATH_AS_STRING + DBUS_TYPE_ARRAY_AS_STRING + DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING + DBUS_TYPE_STRING_AS_STRING + DBUS_TYPE_VARIANT_AS_STRING + DBUS_DICT_ENTRY_END_CHAR_AS_STRING + DBUS_STRUCT_END_CHAR_AS_STRING, &array); + + function(&array, user_data); + + dbus_message_iter_close_container(&iter, &array); + + return TRUE; +} + DBusConnection *connman_dbus_get_connection(void) { if (connection == NULL) @@ -214,6 +398,8 @@ DBusConnection *connman_dbus_get_connection(void) int __connman_dbus_init(DBusConnection *conn) { + DBG(""); + connection = conn; return 0; @@ -221,5 +407,7 @@ int __connman_dbus_init(DBusConnection *conn) void __connman_dbus_cleanup(void) { + DBG(""); + connection = NULL; }