device: Fix storing GATT attributes
This fix two issues:
- not storing attributes after pairing if device is using RPA
- storing attributes for temporary device if it is using static
or public address
diff --git a/src/device.c b/src/device.c
index b43e216..ce515be 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2340,11 +2340,12 @@
dev->pending_paired = false;
}
- if (!dev->temporary)
+ if (!dev->temporary) {
store_device_info(dev);
- if (bdaddr_type != BDADDR_BREDR && err == 0)
- store_services(dev);
+ if (bdaddr_type != BDADDR_BREDR && err == 0)
+ store_services(dev);
+ }
if (req)
browse_request_complete(req, browse_type, bdaddr_type, err);
@@ -5289,6 +5290,12 @@
adapter_whitelist_add(device->adapter, device);
store_device_info(device);
+
+ /* attributes were not stored when resolved if device was temporary */
+ if (device->bdaddr_type != BDADDR_BREDR &&
+ device->le_state.svc_resolved &&
+ g_slist_length(device->primaries) != 0)
+ store_services(device);
}
void btd_device_set_trusted(struct btd_device *device, gboolean trusted)
