2015-09-15 19:58:37

by Jakub Pawlowski

Subject: [PATCH v3] core/device: Store services when they change or after pairing.

Service caching works only for paired devices. Right now caching is
triggered only right after discovery finishes. That means that if already
paired device sends service changed notofication, cache won't be updated.
Also if you connect to new device, and then pair during this connection,
your services won't be cached until reconnect. This will require full
service discovery which is slow.
This patch fixes that by trying to cache services every time services
changed, and right after successful pairing.
---
src/device.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/device.c b/src/device.c
index 8184508..5ec8780 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2202,10 +2202,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type,
if (!dev->temporary)
store_device_info(dev);

- if (bdaddr_type != BDADDR_BREDR && err == 0) {
+ if (bdaddr_type != BDADDR_BREDR && err == 0)
store_services(dev);
- store_gatt_db(dev);
- }

if (!req)
return;
@@ -3313,6 +3311,8 @@ static gboolean gatt_services_changed(gpointer user_data)
{
struct btd_device *device = user_data;

+ store_gatt_db(device);
+
g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE,
"GattServices");

@@ -5315,6 +5315,10 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
* request
*/
if (state->svc_resolved && bonding) {
+ /* Attept to store services for this device failed because it
+ * was not paired. Now that we're paired retry. */
+ store_gatt_db(device);
+
g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
bonding_request_free(bonding);
return;
--
2.5.0

2015-09-16 11:08:13

by Luiz Augusto von Dentz

Subject: Re: [PATCH v3] core/device: Store services when they change or after pairing.

Hi Jakub,

On Tue, Sep 15, 2015 at 10:58 PM, Jakub Pawlowski <[email protected]> wrote:
> Service caching works only for paired devices. Right now caching is
> triggered only right after discovery finishes. That means that if already
> paired device sends service changed notofication, cache won't be updated.
> Also if you connect to new device, and then pair during this connection,
> your services won't be cached until reconnect. This will require full
> service discovery which is slow.
> This patch fixes that by trying to cache services every time services
> changed, and right after successful pairing.
> ---
> src/device.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 8184508..5ec8780 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -2202,10 +2202,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type,
> if (!dev->temporary)
> store_device_info(dev);
>
> - if (bdaddr_type != BDADDR_BREDR && err == 0) {
> + if (bdaddr_type != BDADDR_BREDR && err == 0)
> store_services(dev);
> - store_gatt_db(dev);
> - }
>
> if (!req)
> return;
> @@ -3313,6 +3311,8 @@ static gboolean gatt_services_changed(gpointer user_data)
> {
> struct btd_device *device = user_data;
>
> + store_gatt_db(device);
> +
> g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE,
> "GattServices");
>
> @@ -5315,6 +5315,10 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
> * request
> */
> if (state->svc_resolved && bonding) {
> + /* Attept to store services for this device failed because it
> + * was not paired. Now that we're paired retry. */
> + store_gatt_db(device);
> +
> g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
> bonding_request_free(bonding);
> return;
> --
> 2.5.0

Applied, thanks.

--
Luiz Augusto von Dentz