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);
}
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);
pa_bluetooth_adapter *a;
if ((a = pa_hashmap_get(y->adapters, path))) {
- pa_log_error("Found duplicated D-Bus path for device %s", path);
+ pa_log_error("Found duplicated D-Bus path for adapter %s", path);
return;
} else
a = adapter_create(y, path);
if (!d->adapter && d->adapter_path) {
d->adapter = pa_hashmap_get(d->discovery->adapters, d->adapter_path);
- if (!d->adapter) {
- pa_log_error("Device %s is child of nonexistent adapter %s", d->path, 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);
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);
}