diff options
36 files changed, 110 insertions, 176 deletions
diff --git a/audio/control.c b/audio/control.c index cffcf517..f79eee9c 100644 --- a/audio/control.c +++ b/audio/control.c @@ -44,8 +44,8 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "dbus-service.h" #include "logging.h" #include "uinput.h" diff --git a/audio/device.c b/audio/device.c index c385c7ca..b240bdae 100644 --- a/audio/device.c +++ b/audio/device.c @@ -40,8 +40,8 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "textfile.h" diff --git a/audio/headset.c b/audio/headset.c index 2d635110..247d02d4 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -48,8 +48,8 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "device.h" #include "manager.h" diff --git a/audio/manager.c b/audio/manager.c index bf612bb3..15136b71 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -45,10 +45,9 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "glib-helper.h" #include "dbus-service.h" diff --git a/audio/sink.c b/audio/sink.c index b755759d..af51a9c7 100644 --- a/audio/sink.c +++ b/audio/sink.c @@ -33,8 +33,8 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "avdtp.h" diff --git a/common/Makefile.am b/common/Makefile.am index 5352d34f..6ae5ed7a 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -3,14 +3,13 @@ noinst_LIBRARIES = libhelper.a libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c \ logging.h logging.c error.h error.c \ - dbus-helper.h dbus-helper.c \ glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c sdp-glib.c noinst_PROGRAMS = test_textfile test_textfile_LDADD = libhelper.a -AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ +AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ EXTRA_DIST = ppoll.h uinput.h diff --git a/common/dbus-helper.h b/common/dbus-helper.h deleted file mode 100644 index 6c3c3a89..00000000 --- a/common/dbus-helper.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * - * BlueZ - Bluetooth protocol stack for Linux - * - * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include <stdarg.h> -#include <dbus/dbus.h> - -#define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) -#define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) - -DBusHandlerResult dbus_connection_send_and_unref(DBusConnection *connection, - DBusMessage *message); - -dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, - const char *path, void *user_data, - DBusObjectPathUnregisterFunction function); - -dbus_bool_t dbus_connection_destroy_object_path(DBusConnection *connection, - const char *path); - -dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, - const char *path, - void **data_p); - -typedef struct DBusMethodVTable DBusMethodVTable; - -struct DBusMethodVTable { - const char *name; - DBusObjectPathMessageFunction message_function; - const char *signature; - const char *reply; -}; - -typedef struct DBusSignalVTable DBusSignalVTable; - -struct DBusSignalVTable { - const char *name; - const char *signature; -}; - -typedef struct DBusPropertyVTable DBusPropertyVTable; - -struct DBusPropertyVTable { - const char *name; -}; - -dbus_bool_t dbus_connection_register_interface(DBusConnection *connection, - const char *path, const char *name, - DBusMethodVTable *methods, - DBusSignalVTable *signals, - DBusPropertyVTable *properties); - -dbus_bool_t dbus_connection_unregister_interface(DBusConnection *connection, - const char *path, const char *name); -void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); -void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, - const char *key, int type, void *val); -void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, - const char *first_key, - va_list var_args); -void dbus_message_iter_append_dict(DBusMessageIter *iter, - const char *first_key, ...); -dbus_bool_t dbus_connection_emit_signal(DBusConnection *conn, const char *path, - const char *interface, const char *name, - int first, ...); - -dbus_bool_t dbus_connection_emit_signal_valist(DBusConnection *conn, - const char *path, - const char *interface, - const char *name, - int first, - va_list var_args); -dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, - const char *path, - const char *interface, - const char *name, - int type, void *value); - -static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, - DBusMessage *msg) -{ - if (msg) { - dbus_connection_send(conn, msg, NULL); - dbus_message_unref(msg); - } - - return DBUS_HANDLER_RESULT_HANDLED; -} diff --git a/common/error.c b/common/error.c index 58999393..656c7299 100644 --- a/common/error.c +++ b/common/error.c @@ -31,7 +31,8 @@ #include <string.h> #include <errno.h> -#include "dbus-helper.h" +#include <gdbus.h> + #include "error.h" /** diff --git a/daemon/adapter.c b/daemon/adapter.c index d8e4c9d4..2c5e608e 100644 --- a/daemon/adapter.c +++ b/daemon/adapter.c @@ -26,8 +26,8 @@ #endif #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "system.h" diff --git a/daemon/database.c b/daemon/database.c index b7d5562d..f0c8b38d 100644 --- a/daemon/database.c +++ b/daemon/database.c @@ -33,12 +33,9 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "sdp-xml.h" #include "logging.h" diff --git a/daemon/main.c b/daemon/main.c index 0c735c35..a1b58ada 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -34,13 +34,9 @@ #include <sys/stat.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" - #include "logging.h" #include "sdpd.h" diff --git a/daemon/manager.c b/daemon/manager.c index 3c30575c..92e34dd5 100644 --- a/daemon/manager.c +++ b/daemon/manager.c @@ -26,8 +26,8 @@ #endif #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "system.h" diff --git a/daemon/service.c b/daemon/service.c index 27ed2417..7668d653 100644 --- a/daemon/service.c +++ b/daemon/service.c @@ -30,10 +30,9 @@ #include <signal.h> #include <glib.h> - #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "system.h" diff --git a/gdbus/Makefile.am b/gdbus/Makefile.am index 937b1d7f..9447555f 100644 --- a/gdbus/Makefile.am +++ b/gdbus/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libgdbus.la -libgdbus_la_SOURCES = gdbus.h mainloop.c watch.c +libgdbus_la_SOURCES = gdbus.h mainloop.c object.c watch.c AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index d1902a52..d8382306 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -40,6 +40,88 @@ gboolean g_dbus_set_disconnect_function(DBusConnection *connection, GDBusDisconnectFunction function, void *user_data, DBusFreeFunction destroy); +#define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) +#define DBUS_TYPE_BYTE_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING) + +DBusHandlerResult dbus_connection_send_and_unref(DBusConnection *connection, + DBusMessage *message); + +dbus_bool_t dbus_connection_create_object_path(DBusConnection *connection, + const char *path, void *user_data, + DBusObjectPathUnregisterFunction function); + +dbus_bool_t dbus_connection_destroy_object_path(DBusConnection *connection, + const char *path); + +dbus_bool_t dbus_connection_get_object_user_data(DBusConnection *connection, + const char *path, + void **data_p); + +typedef struct DBusMethodVTable DBusMethodVTable; + +struct DBusMethodVTable { + const char *name; + DBusObjectPathMessageFunction message_function; + const char *signature; + const char *reply; +}; + +typedef struct DBusSignalVTable DBusSignalVTable; + +struct DBusSignalVTable { + const char *name; + const char *signature; +}; + +typedef struct DBusPropertyVTable DBusPropertyVTable; + +struct DBusPropertyVTable { + const char *name; +}; + +dbus_bool_t dbus_connection_register_interface(DBusConnection *connection, + const char *path, const char *name, + DBusMethodVTable *methods, + DBusSignalVTable *signals, + DBusPropertyVTable *properties); + +dbus_bool_t dbus_connection_unregister_interface(DBusConnection *connection, + const char *path, const char *name); +void dbus_message_iter_append_variant(DBusMessageIter *iter, int type, void *val); +void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, + const char *key, int type, void *val); +void dbus_message_iter_append_dict_valist(DBusMessageIter *iter, + const char *first_key, + va_list var_args); +void dbus_message_iter_append_dict(DBusMessageIter *iter, + const char *first_key, ...); +dbus_bool_t dbus_connection_emit_signal(DBusConnection *conn, const char *path, + const char *interface, const char *name, + int first, ...); + +dbus_bool_t dbus_connection_emit_signal_valist(DBusConnection *conn, + const char *path, + const char *interface, + const char *name, + int first, + va_list var_args); +dbus_bool_t dbus_connection_emit_property_changed(DBusConnection *conn, + const char *path, + const char *interface, + const char *name, + int type, void *value); + +static inline DBusHandlerResult send_message_and_unref(DBusConnection *conn, + DBusMessage *msg) +{ + if (msg) { + dbus_connection_send(conn, msg, NULL); + dbus_message_unref(msg); + } + + return DBUS_HANDLER_RESULT_HANDLED; +} + typedef void (*name_cb_t)(const char *name, void *user_data); guint name_listener_add(DBusConnection *connection, const char *name, diff --git a/common/dbus-helper.c b/gdbus/object.c index a7604f65..12ba66a9 100644 --- a/common/dbus-helper.c +++ b/gdbus/object.c @@ -25,16 +25,17 @@ #include <config.h> #endif -#include <stdlib.h> +#include <stdio.h> #include <string.h> #include <glib.h> - #include <dbus/dbus.h> -#include "logging.h" +#include "gdbus.h" -#include "dbus-helper.h" +#define info(fmt...) +#define error(fmt...) +#define debug(fmt...) struct generic_data { void *user_data; diff --git a/hcid/adapter.c b/hcid/adapter.c index 4bc7245e..1383ed50 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -45,9 +45,7 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> #include "hcid.h" @@ -58,7 +56,6 @@ #include "textfile.h" #include "oui.h" #include "dbus-common.h" -#include "dbus-helper.h" #include "dbus-hci.h" #include "dbus-sdp.h" #include "dbus-database.h" diff --git a/hcid/agent.c b/hcid/agent.c index e7bf7d96..330d00e4 100644 --- a/hcid/agent.c +++ b/hcid/agent.c @@ -38,12 +38,9 @@ #include <bluetooth/sdp.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "hcid.h" #include "dbus-common.h" #include "dbus-service.h" diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index 7a28555d..5acec28d 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -46,13 +46,10 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> #include "hcid.h" -#include "dbus-helper.h" #include "dbus-error.h" #include "manager.h" #include "adapter.h" diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index 370b7658..acf5301c 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -37,12 +37,9 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "hcid.h" #include "sdpd.h" #include "sdp-xml.h" diff --git a/hcid/dbus-error.c b/hcid/dbus-error.c index 876082a4..b08cf33b 100644 --- a/hcid/dbus-error.c +++ b/hcid/dbus-error.c @@ -29,12 +29,12 @@ #include <stdio.h> #include <errno.h> -#include <dbus/dbus.h> - #include <bluetooth/sdp.h> +#include <dbus/dbus.h> +#include <gdbus.h> + #include "hcid.h" -#include "dbus-helper.h" #include "dbus-common.h" #include "dbus-error.h" #include "error.h" diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index ec4e0f50..319d7cbd 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -42,9 +42,7 @@ #include <bluetooth/sdp.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> #include "hcid.h" @@ -53,7 +51,6 @@ #include "adapter.h" #include "device.h" #include "error.h" -#include "dbus-helper.h" #include "glib-helper.h" #include "dbus-common.h" #include "dbus-error.h" diff --git a/hcid/dbus-sdp.c b/hcid/dbus-sdp.c index 0b3bc85e..2a0aa583 100644 --- a/hcid/dbus-sdp.c +++ b/hcid/dbus-sdp.c @@ -46,12 +46,9 @@ #include <netinet/in.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "hcid.h" #include "textfile.h" #include "adapter.h" diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c index 2e4a8bfe..cecb39af 100644 --- a/hcid/dbus-security.c +++ b/hcid/dbus-security.c @@ -39,13 +39,10 @@ #include <bluetooth/sdp.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> #include "adapter.h" -#include "dbus-helper.h" #include "hcid.h" #include "dbus-common.h" #include "dbus-service.h" diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index 59228a9d..4e8ff33c 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -42,10 +42,9 @@ #include <bluetooth/sdp.h> #include <glib.h> - #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "hcid.h" #include "server.h" #include "dbus-common.h" diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c index d683a901..f63f9b45 100644 --- a/hcid/dbus-test.c +++ b/hcid/dbus-test.c @@ -35,12 +35,9 @@ #include <bluetooth/sdp.h> #include <glib.h> - #include <dbus/dbus.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "hcid.h" #include "dbus-common.h" #include "adapter.h" diff --git a/hcid/device.c b/hcid/device.c index 56a70ec2..850ce1af 100644 --- a/hcid/device.c +++ b/hcid/device.c @@ -42,10 +42,8 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> - -#include "dbus-helper.h" +#include <gdbus.h> #include "hcid.h" #include "sdpd.h" diff --git a/hcid/manager.c b/hcid/manager.c index 0d438217..be92b1b3 100644 --- a/hcid/manager.c +++ b/hcid/manager.c @@ -48,7 +48,6 @@ #include "hcid.h" #include "sdpd.h" #include "adapter.h" -#include "dbus-helper.h" #include "dbus-common.h" #include "error.h" #include "dbus-error.h" diff --git a/input/device.c b/input/device.c index 151ce08c..1975be16 100644 --- a/input/device.c +++ b/input/device.c @@ -41,8 +41,8 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "textfile.h" #include "uinput.h" diff --git a/input/manager.c b/input/manager.c index 11e14514..618641f1 100644 --- a/input/manager.c +++ b/input/manager.c @@ -39,10 +39,9 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> - #include <dbus/dbus.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "textfile.h" diff --git a/input/server.c b/input/server.c index 5e29e99f..ea7139ec 100644 --- a/input/server.c +++ b/input/server.c @@ -39,13 +39,13 @@ #include <glib.h> #include <dbus/dbus.h> +#include <gdbus.h> #include "logging.h" #include "device.h" #include "server.h" #include "storage.h" -#include "dbus-helper.h" #include "dbus-service.h" static const char* HID_UUID = "00001124-0000-1000-8000-00805f9b34fb"; diff --git a/network/connection.c b/network/connection.c index 466dd203..e5ed6d9c 100644 --- a/network/connection.c +++ b/network/connection.c @@ -39,9 +39,9 @@ #include <bluetooth/sdp.h> #include <glib.h> +#include <gdbus.h> #include "logging.h" -#include "dbus-helper.h" #include "textfile.h" #include "glib-helper.h" diff --git a/network/manager.c b/network/manager.c index 14bea175..39aaa6e0 100644 --- a/network/manager.c +++ b/network/manager.c @@ -39,8 +39,8 @@ #include <bluetooth/sdp_lib.h> #include <glib.h> +#include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "textfile.h" #include "glib-helper.h" diff --git a/network/server.c b/network/server.c index f4fb5176..71b45b22 100644 --- a/network/server.c +++ b/network/server.c @@ -43,11 +43,11 @@ #include <netinet/in.h> #include <glib.h> +#include <gdbus.h> #include "logging.h" #include "error.h" #include "textfile.h" -#include "dbus-helper.h" #include "dbus-service.h" #include "sdpd.h" diff --git a/serial/manager.c b/serial/manager.c index a10e1631..aa05b8f3 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -48,10 +48,8 @@ #include <bluetooth/rfcomm.h> #include <glib.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "textfile.h" diff --git a/serial/port.c b/serial/port.c index 98b751be..215dc62b 100644 --- a/serial/port.c +++ b/serial/port.c @@ -40,10 +40,8 @@ #include <bluetooth/rfcomm.h> #include <glib.h> - #include <gdbus.h> -#include "dbus-helper.h" #include "logging.h" #include "error.h" |