return false;
}
+static int transport_state_from_string(const char* value, pa_bluetooth_transport_state_t *state) {
+ pa_assert(value);
+ pa_assert(state);
+
+ if (pa_streq(value, "idle"))
+ *state = PA_BLUETOOTH_TRANSPORT_STATE_IDLE;
+ else if (pa_streq(value, "pending") || pa_streq(value, "active"))
+ *state = PA_BLUETOOTH_TRANSPORT_STATE_PLAYING;
+ else
+ return -1;
+
+ return 0;
+}
+
+static void parse_transport_property(pa_bluetooth_transport *t, DBusMessageIter *i) {
+ const char *key;
+ DBusMessageIter variant_i;
+
+ key = check_variant_property(i);
+ if (key == NULL)
+ return;
+
+ 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, "State")) {
+ pa_bluetooth_transport_state_t state;
+
+ if (transport_state_from_string(value, &state) < 0) {
+ pa_log_error("Invalid state received: %s", value);
+ return;
+ }
+
+ transport_state_changed(t, state);
+ }
+
+ break;
+ }
+ }
+
+ return;
+}
+
+static int parse_transport_properties(pa_bluetooth_transport *t, DBusMessageIter *i) {
+ DBusMessageIter element_i;
+
+ 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);
+
+ parse_transport_property(t, &dict_i);
+
+ dbus_message_iter_next(&element_i);
+ }
+
+ return 0;
+}
+
static pa_bluetooth_device* device_create(pa_bluetooth_discovery *y, const char *path) {
pa_bluetooth_device *d;
pa_assert(local);
while ((d = pa_hashmap_iterate(y->devices, &state, NULL)))
- if (pa_streq(d->address, remote) && pa_streq(d->adapter->address, local))
- return d->device_info_valid == 1 ? d : NULL;
+ if (d->device_info_valid == 1 && pa_streq(d->address, remote) && pa_streq(d->adapter->address, local))
+ return d;
return NULL;
}
if (d->uuids)
pa_hashmap_free(d->uuids);
- d->discovery = NULL;
- d->adapter = NULL;
pa_xfree(d->path);
pa_xfree(d->alias);
pa_xfree(d->address);
+ pa_xfree(d->adapter_path);
pa_xfree(d);
}
}
}
-static void device_remove_all(pa_bluetooth_discovery *y) {
- pa_bluetooth_device *d;
+static void set_device_info_valid(pa_bluetooth_device *device, int valid) {
+ bool old_any_connected;
- pa_assert(y);
+ pa_assert(device);
+ pa_assert(valid == -1 || valid == 0 || valid == 1);
- while ((d = pa_hashmap_steal_first(y->devices))) {
- d->device_info_valid = -1;
- pa_hook_fire(&y->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], d);
- device_free(d);
- }
+ if (valid == device->device_info_valid)
+ return;
+
+ old_any_connected = pa_bluetooth_device_any_transport_connected(device);
+ device->device_info_valid = valid;
+
+ if (pa_bluetooth_device_any_transport_connected(device) != old_any_connected)
+ pa_hook_fire(&device->discovery->hooks[PA_BLUETOOTH_HOOK_DEVICE_CONNECTION_CHANGED], device);
}
static pa_bluetooth_adapter* adapter_create(pa_bluetooth_discovery *y, const char *path) {
pa_assert(a->discovery);
PA_HASHMAP_FOREACH(d, a->discovery->devices, state)
- if (d->adapter == a)
+ if (d->adapter == a) {
+ set_device_info_valid(d, -1);
d->adapter = NULL;
+ }
pa_xfree(a->path);
pa_xfree(a->address);
}
}
-static void adapter_remove_all(pa_bluetooth_discovery *y) {
- pa_bluetooth_adapter *a;
-
- pa_assert(y);
-
- /* When this function is called all devices have already been freed */
-
- while ((a = pa_hashmap_steal_first(y->adapters)))
- adapter_free(a);
-}
-
static void parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, bool is_property_change) {
const char *key;
DBusMessageIter variant_i;
return;
}
- if (d->adapter) {
+ if (d->adapter_path) {
pa_log_warn("Device %s: Received a duplicate 'Adapter' property, ignoring", d->path);
return;
}
+ d->adapter_path = pa_xstrdup(value);
+
d->adapter = pa_hashmap_get(d->discovery->adapters, value);
if (!d->adapter)
pa_log_info("Device %s: 'Adapter' property references an unknown adapter %s.", d->path, value);
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);
dbus_message_iter_next(&element_i);
}
- if (!d->address || !d->adapter || !d->alias) {
+ if (!d->address || !d->adapter_path || !d->alias) {
pa_log_error("Non-optional information missing for device %s", d->path);
- d->device_info_valid = -1;
+ set_device_info_valid(d, -1);
return -1;
}
- d->device_info_valid = 1;
- return ret;
+ if (!is_property_change && d->adapter)
+ set_device_info_valid(d, 1);
+
+ /* If d->adapter is NULL, device_info_valid will be left as 0, and updated
+ * after all interfaces have been parsed. */
+
+ return 0;
}
static void parse_adapter_properties(pa_bluetooth_adapter *a, DBusMessageIter *i, bool is_property_change) {
dbus_message_iter_recurse(&dict_i, &variant_i);
if (dbus_message_iter_get_arg_type(&variant_i) == DBUS_TYPE_STRING && pa_streq(key, "Address")) {
- char *value;
+ const char *value;
if (is_property_change) {
pa_log_warn("Adapter property 'Address' expected to be constant but changed for %s, ignoring", a->path);
static void parse_interfaces_and_properties(pa_bluetooth_discovery *y, DBusMessageIter *dict_i) {
DBusMessageIter element_i;
const char *path;
+ void *state;
pa_bluetooth_device *d;
pa_assert(dbus_message_iter_get_arg_type(dict_i) == DBUS_TYPE_OBJECT_PATH);
dbus_message_iter_next(&element_i);
}
+ PA_HASHMAP_FOREACH(d, y->devices, state) {
+ if (d->device_info_valid != 0)
+ continue;
+
+ if (!d->adapter && d->adapter_path) {
+ d->adapter = pa_hashmap_get(d->discovery->adapters, d->adapter_path);
+ if (!d->adapter || !d->adapter->address) {
+ pa_log_error("Device %s is child of nonexistent or corrupted adapter %s", d->path, d->adapter_path);
+ set_device_info_valid(d, -1);
+ } else
+ set_device_info_valid(d, 1);
+ }
+ }
+
return;
}
if (pa_streq(name, BLUEZ_SERVICE)) {
if (old_owner && *old_owner) {
pa_log_debug("Bluetooth daemon disappeared");
- device_remove_all(y);
- adapter_remove_all(y);
+ pa_hashmap_remove_all(y->devices);
+ pa_hashmap_remove_all(y->adapters);
y->objects_listed = false;
}
}
parse_adapter_properties(a, &arg_i, true);
+
+ } else if (pa_streq(iface, BLUEZ_DEVICE_INTERFACE)) {
+ pa_bluetooth_device *d;
+
+ pa_log_debug("Properties changed in device %s", dbus_message_get_path(m));
+
+ if (!(d = pa_hashmap_get(y->devices, dbus_message_get_path(m)))) {
+ pa_log_warn("Properties changed in unknown device");
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ if (d->device_info_valid != 1) {
+ pa_log_warn("Properties changed in a device which information is unknown or invalid");
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+
+ parse_device_properties(d, &arg_i, true);
+ } else if (pa_streq(iface, BLUEZ_MEDIA_TRANSPORT_INTERFACE)) {
+ pa_bluetooth_transport *t;
+
+ pa_log_debug("Properties changed in transport %s", dbus_message_get_path(m));
+
+ if (!(t = pa_hashmap_get(y->transports, dbus_message_get_path(m))))
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+ parse_transport_properties(t, &arg_i);
}
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
goto fail2;
}
} else {
- /* InterfacesAdded signal is probably on it's way, device_info_valid is kept as 0. */
+ /* InterfacesAdded signal is probably on its way, device_info_valid is kept as 0. */
pa_log_warn("SetConfiguration() received for unknown device %s", dev_path);
d = device_create(y, dev_path);
}
DBusConnection *conn;
unsigned i;
- if ((y = pa_shared_get(c, "bluetooth-discovery")))
- return pa_bluetooth_discovery_ref(y);
-
y = pa_xnew0(pa_bluetooth_discovery, 1);
PA_REFCNT_INIT(y);
y->core = c;
- y->adapters = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
- y->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
+ y->adapters = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL,
+ (pa_free_cb_t) adapter_free);
+ y->devices = pa_hashmap_new_full(pa_idxset_string_hash_func, pa_idxset_string_compare_func, NULL,
+ (pa_free_cb_t) device_free);
y->transports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
PA_LLIST_HEAD_INIT(pa_dbus_pending, y->pending);
"member='InterfacesRemoved'",
"type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
",arg0='" BLUEZ_ADAPTER_INTERFACE "'",
+ "type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
+ ",arg0='" BLUEZ_DEVICE_INTERFACE "'",
+ "type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'"
+ ",arg0='" BLUEZ_MEDIA_TRANSPORT_INTERFACE "'",
NULL) < 0) {
pa_log_error("Failed to add D-Bus matches: %s", err.message);
goto fail;
pa_dbus_free_pending_list(&y->pending);
- if (y->devices) {
- device_remove_all(y);
+ if (y->devices)
pa_hashmap_free(y->devices);
- }
- if (y->adapters) {
- adapter_remove_all(y);
+ if (y->adapters)
pa_hashmap_free(y->adapters);
- }
if (y->transports) {
pa_assert(pa_hashmap_isempty(y->transports));
"member='InterfacesRemoved'",
"type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',"
"member='PropertiesChanged',arg0='" BLUEZ_ADAPTER_INTERFACE "'",
+ "type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',"
+ "member='PropertiesChanged',arg0='" BLUEZ_DEVICE_INTERFACE "'",
+ "type='signal',sender='" BLUEZ_SERVICE "',interface='org.freedesktop.DBus.Properties',"
+ "member='PropertiesChanged',arg0='" BLUEZ_MEDIA_TRANSPORT_INTERFACE "'",
NULL);
if (y->filter_added)