2018-03-26 14:11:52

by Szymon Janc

Subject: [PATCH v2 1/2] device: Change storage warning to debug messages

It is normal for device to have private address so there is no reason
to issue warning message when not storing data for it.
---
src/device.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/device.c b/src/device.c
index 780458fd7..b43e21658 100644
--- a/src/device.c
+++ b/src/device.c
@@ -480,7 +480,7 @@ static void store_device_info(struct btd_device *device)
return;

if (device_address_is_private(device)) {
- warn("Can't store info for private addressed device %s",
+ DBG("Can't store info for private addressed device %s",
device->path);
return;
}
@@ -497,7 +497,7 @@ void device_store_cached_name(struct btd_device *dev, const char *name)
gsize length = 0;

if (device_address_is_private(dev)) {
- warn("Can't store name for private addressed device %s",
+ DBG("Can't store name for private addressed device %s",
dev->path);
return;
}
@@ -2012,7 +2012,7 @@ static void store_services(struct btd_device *device)
gsize length = 0;

if (device_address_is_private(device)) {
- warn("Can't store services for private addressed device %s",
+ DBG("Can't store services for private addressed device %s",
device->path);
return;
}
@@ -2200,7 +2200,7 @@ static void store_gatt_db(struct btd_device *device)
struct gatt_saver saver;

if (device_address_is_private(device)) {
- warn("Can't store GATT db for private addressed device %s",
+ DBG("Can't store GATT db for private addressed device %s",
device->path);
return;
}
--
2.14.3

2018-03-27 11:08:21

by Luiz Augusto von Dentz

Subject: Re: [PATCH v2 1/2] device: Change storage warning to debug messages

Hi Szymon,

On Mon, Mar 26, 2018 at 5:11 PM, Szymon Janc <[email protected]> wrote:
> It is normal for device to have private address so there is no reason
> to issue warning message when not storing data for it.
> ---
> src/device.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 780458fd7..b43e21658 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -480,7 +480,7 @@ static void store_device_info(struct btd_device *device)
> return;
>
> if (device_address_is_private(device)) {
> - warn("Can't store info for private addressed device %s",
> + DBG("Can't store info for private addressed device %s",
> device->path);
> return;
> }
> @@ -497,7 +497,7 @@ void device_store_cached_name(struct btd_device *dev, const char *name)
> gsize length = 0;
>
> if (device_address_is_private(dev)) {
> - warn("Can't store name for private addressed device %s",
> + DBG("Can't store name for private addressed device %s",
> dev->path);
> return;
> }
> @@ -2012,7 +2012,7 @@ static void store_services(struct btd_device *device)
> gsize length = 0;
>
> if (device_address_is_private(device)) {
> - warn("Can't store services for private addressed device %s",
> + DBG("Can't store services for private addressed device %s",
> device->path);
> return;
> }
> @@ -2200,7 +2200,7 @@ static void store_gatt_db(struct btd_device *device)
> struct gatt_saver saver;
>
> if (device_address_is_private(device)) {
> - warn("Can't store GATT db for private addressed device %s",
> + DBG("Can't store GATT db for private addressed device %s",
> device->path);
> return;
> }
> --
> 2.14.3

Applied, thanks.

--
Luiz Augusto von Dentz

2018-03-26 14:11:53

by Szymon Janc

Subject: [PATCH v2 2/2] 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
---
src/device.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/device.c b/src/device.c
index b43e21658..ce515be9b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2340,11 +2340,12 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t browse_type,
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 @@ void btd_device_set_temporary(struct btd_device *device, bool temporary)
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)
--
2.14.3