From: Jo?o Paulo Rechi Vita <jprvita@xxxxxxxxxxxxx>
This code is based on previous work by Mikel Astiz.
---
src/modules/bluetooth/bluez5-util.c | 157 +++++++++++++++++++++++++++++++++++-
src/modules/bluetooth/bluez5-util.h | 1 +
2 files changed, 156 insertions(+), 2 deletions(-)
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 3556931..1168267 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -106,6 +106,31 @@ static pa_dbus_pending* pa_bluetooth_dbus_send_and_add_to_pending(pa_bluetooth_d
return p;
}
+static const char *pa_bluetooth_dbus_check_variant_property(DBusMessageIter *i) {
+ const char *key;
+
+ pa_assert(i);
+
+ if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_STRING) {
+ pa_log_error("Property name not a string.");
+ return NULL;
+ }
+
+ dbus_message_iter_get_basic(i, &key);
+
+ if (!dbus_message_iter_next(i)) {
+ pa_log_error("Property value missing");
+ return NULL;
+ }
+
+ if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_VARIANT) {
+ pa_log_error("Property value not a variant.");
+ return NULL;
+ }
+
+ return key;
+}
+
pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const char *owner, const char *path,
pa_bluetooth_profile_t p, const uint8_t *config, size_t size,
pa_bluetooth_transport_acquire_cb acquire,
@@ -238,6 +263,7 @@ static pa_bluetooth_device* pa_bluetooth_discovery_create_device(pa_bluetooth_di
d = pa_xnew0(pa_bluetooth_device, 1);
d->discovery = y;
d->path = pa_xstrdup(path);
+ d->uuids = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
pa_hashmap_put(y->devices, d->path, d);
@@ -291,6 +317,9 @@ static void pa_bluetooth_device_free(pa_bluetooth_device *d) {
pa_bluetooth_transport_free(t);
}
+ if (d->uuids)
+ pa_hashmap_free(d->uuids, NULL);
+
d->discovery = NULL;
pa_xfree(d->path);
pa_xfree(d->alias);
@@ -322,6 +351,128 @@ static void pa_bluetooth_discovery_remove_all_devices(pa_bluetooth_discovery *y)
}
}
+static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
+ const char *key;
+ DBusMessageIter variant_i;
+
+ pa_assert(d);
+
+ pa_log_debug("Parsing properties for device %s", d->path);
+
+ key = pa_bluetooth_dbus_check_variant_property(i);
+ if (key == NULL) {
+ pa_log_error("Received invalid property for device %s", d->path);
+ return -1;
+ }
+
+ dbus_message_iter_recurse(i, &variant_i);
+
+ switch (dbus_message_iter_get_arg_type(&variant_i)) {
+
+ case DBUS_TYPE_STRING: {
+ const char *value;
+ dbus_message_iter_get_basic(&variant_i, &value);
+
+ if (pa_streq(key, "Alias")) {
+ pa_xfree(d->alias);
+ d->alias = pa_xstrdup(value);
+ } else if (pa_streq(key, "Address")) {
+ if (is_property_change) {
+ pa_log_error("Device property 'Address' expected to be constant but changed for %s", d->path);
+ return -1;
+ }
+
+ if (d->remote) {
+ pa_log_error("Device %s: Received a duplicate 'Address' property.", d->path);
+ return -1;
+ }
+
+ d->remote = pa_xstrdup(value);
+ } else if (pa_streq(key, "Adapter")) {
+ if (is_property_change) {
+ pa_log_error("Device property 'Adapter' expected to be constant but changed for %s", d->path);
+ return -1;
+ }
+
+ if (d->local) {
+ pa_log_error("Device %s: Received a duplicate 'Adapter' property.", d->path);
+ return -1;
+ }
+
+ d->local = pa_hashmap_get(d->discovery->adapters, value);
+ }
+
+ pa_log_debug("%s: %s", key, value);
+ break;
+ }
+
+ case DBUS_TYPE_UINT32: {
+ uint32_t value;
+ dbus_message_iter_get_basic(&variant_i, &value);
+
+ if (pa_streq(key, "Class"))
+ d->class_of_device = (int) value;
+
+ pa_log_debug("%s: %d", key, value);
+ break;
+ }
+
+ case DBUS_TYPE_ARRAY: {
+ DBusMessageIter ai;
+ dbus_message_iter_recurse(&variant_i, &ai);
+
+ if (dbus_message_iter_get_arg_type(&ai) == DBUS_TYPE_STRING && pa_streq(key, "UUIDs")) {
+ while (dbus_message_iter_get_arg_type(&ai) != DBUS_TYPE_INVALID) {
+ const char *value;
+
+ dbus_message_iter_get_basic(&ai, &value);
+
+ if (pa_hashmap_get(d->uuids, value)) {
+ dbus_message_iter_next(&ai);
+ continue;
+ }
+
+ pa_hashmap_put(d->uuids, value, (void *) 1);
+
+ pa_log_debug("%s: %s", key, value);
+ dbus_message_iter_next(&ai);
+ }
+ }
+
+ break;
+ }
+ }
+
+ return 0;
+}
+
+static int parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
+ DBusMessageIter element_i;
+ int ret = 0;
+
+ dbus_message_iter_recurse(i, &element_i);
+
+ while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_DICT_ENTRY) {
+ DBusMessageIter dict_i;
+
+ dbus_message_iter_recurse(&element_i, &dict_i);
+
+ if (parse_device_property(d, &dict_i, is_property_change) < 0)
+ ret = -1;
+
+ dbus_message_iter_next(&element_i);
+ }
+
+ if (!d->remote || !d->local || !d->alias) {
+ pa_log_error("Non-optional information missing for device %s", d->path);
+ d->device_info_valid = -1;
+ return -1;
+ }
+
+ d->device_info_valid = 1;
+ return ret;
+}
+
static int parse_adapter_properties(pa_bluetooth_discovery *y, const char *adapter, DBusMessageIter *i) {
DBusMessageIter element_i;
@@ -461,6 +612,8 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
register_endpoint(y, path, A2DP_SOURCE_ENDPOINT, A2DP_SOURCE_UUID);
register_endpoint(y, path, A2DP_SINK_ENDPOINT, A2DP_SINK_UUID);
} else if (pa_streq(interface, BLUEZ_DEVICE_INTERFACE)) {
+ pa_bluetooth_device *d;
+
if (pa_bluetooth_discovery_get_device_by_path(y, path)) {
pa_log_error("Found duplicated D-Bus path for device %s", path);
return;
@@ -468,8 +621,8 @@ static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessa
pa_log_debug("Device %s found", path);
- pa_bluetooth_discovery_create_device(y, path);
- /* TODO: parse device properties */
+ d = pa_bluetooth_discovery_create_device(y, path);
+ parse_device_properties(d, &iface_i, false);
} else
pa_log_debug("Unknown interface %s found, skipping", interface);
diff --git a/src/modules/bluetooth/bluez5-util.h b/src/modules/bluetooth/bluez5-util.h
index 07a25e3..192851a 100644
--- a/src/modules/bluetooth/bluez5-util.h
+++ b/src/modules/bluetooth/bluez5-util.h
@@ -83,6 +83,7 @@ struct pa_bluetooth_device {
char *remote;
char *local;
int class_of_device;
+ pa_hashmap *uuids;
pa_bluetooth_transport *transports[PA_BLUETOOTH_PROFILE_COUNT];
};
--
1.7.11.7
