Message ID | 20210825165125.2675544-2-david@lechnology.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Luiz Von Dentz |
Headers | show |
Series | device: fix advertising data UUIDs ignored when Cache = yes | expand |
This is automated email and please do not reply to this email! Dear submitter, Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series: PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=537283 ---Test result--- Test Summary: CheckPatch PASS 0.48 seconds GitLint PASS 0.21 seconds Prep - Setup ELL PASS 40.13 seconds Build - Prep PASS 0.09 seconds Build - Configure PASS 7.11 seconds Build - Make PASS 174.78 seconds Make Check PASS 8.99 seconds Make Distcheck PASS 206.59 seconds Build w/ext ELL - Configure PASS 7.11 seconds Build w/ext ELL - Make PASS 166.73 seconds Details ############################## Test: CheckPatch - PASS Desc: Run checkpatch.pl script with rule in .checkpatch.conf ############################## Test: GitLint - PASS Desc: Run gitlint with rule in .gitlint ############################## Test: Prep - Setup ELL - PASS Desc: Clone, build, and install ELL ############################## Test: Build - Prep - PASS Desc: Prepare environment for build ############################## Test: Build - Configure - PASS Desc: Configure the BlueZ source tree ############################## Test: Build - Make - PASS Desc: Build the BlueZ source tree ############################## Test: Make Check - PASS Desc: Run 'make check' ############################## Test: Make Distcheck - PASS Desc: Run distcheck to check the distribution ############################## Test: Build w/ext ELL - Configure - PASS Desc: Configure BlueZ source with '--enable-external-ell' configuration ############################## Test: Build w/ext ELL - Make - PASS Desc: Build BlueZ source with '--enable-external-ell' configuration --- Regards, Linux Bluetooth
Hi David, On Wed, Aug 25, 2021 at 9:54 AM David Lechner <david@lechnology.com> wrote: > > The eir_uuids list contains GATT service UUIDs from advertising data. > The device may advertise different UUIDs each time it is scanned and > connected, so the list needs to be cleared when the device disconnects. > > This partially fixes an issue where the UUIDs D-Bus property is empty > after scanning, connecting, disconnecting and scanning again when > [GATT] Cache = yes is set in main.conf. > > Issue: https://github.com/bluez/bluez/issues/192 > Signed-off-by: David Lechner <david@lechnology.com> > --- > src/device.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/device.c b/src/device.c > index 807106812..53ef3e9a1 100644 > --- a/src/device.c > +++ b/src/device.c > @@ -3129,6 +3129,9 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) > > device_update_last_seen(device, bdaddr_type); > > + g_slist_free_full(device->eir_uuids, g_free); > + device->eir_uuids = NULL; > + > g_dbus_emit_property_changed(dbus_conn, device->path, > DEVICE_INTERFACE, "Connected"); > > -- > 2.25.1 Applied, thanks.
Hello, I have just found the same problem even if [GATT] Cache = no is set in main.conf. It is simply the same because the device is held as temporary device. Additionally the method "dev_property_get_uuids" in device.c only returns UUIDs of the cached (temporary hold) device because dev->le_state.svc_resolved is not turned to false on disconnect. So if a disconnected device advertised an new UUID, you never get notified about it through dbus. Through DBus device node I would expect to get both UUID lists. The cached ones and also the advertised ones. Actually I just merge the two lists and provide the result to DBus device->UUIDs request. Hope you can change this. Thanks. Thomas -----Ursprüngliche Nachricht----- Von: Luiz Augusto von Dentz [mailto:luiz.dentz@gmail.com] Gesendet: Donnerstag, 26. August 2021 00:13 An: David Lechner <david@lechnology.com> Cc: linux-bluetooth@vger.kernel.org Betreff: Re: [PATCH BlueZ v2 1/2] device: clear eir_uuids list on disconnect Hi David, On Wed, Aug 25, 2021 at 9:54 AM David Lechner <david@lechnology.com> wrote: > > The eir_uuids list contains GATT service UUIDs from advertising data. > The device may advertise different UUIDs each time it is scanned and > connected, so the list needs to be cleared when the device disconnects. > > This partially fixes an issue where the UUIDs D-Bus property is empty > after scanning, connecting, disconnecting and scanning again when > [GATT] Cache = yes is set in main.conf. > > Issue: https://github.com/bluez/bluez/issues/192 > Signed-off-by: David Lechner <david@lechnology.com> > --- > src/device.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/src/device.c b/src/device.c index 807106812..53ef3e9a1 > 100644 > --- a/src/device.c > +++ b/src/device.c > @@ -3129,6 +3129,9 @@ void device_remove_connection(struct btd_device > *device, uint8_t bdaddr_type) > > device_update_last_seen(device, bdaddr_type); > > + g_slist_free_full(device->eir_uuids, g_free); > + device->eir_uuids = NULL; > + > g_dbus_emit_property_changed(dbus_conn, device->path, > DEVICE_INTERFACE, > "Connected"); > > -- > 2.25.1 Applied, thanks. -- Luiz Augusto von Dentz
On 8/25/21 11:24 PM, Eisenkolb Thomas wrote: > Hello, > > I have just found the same problem even if [GATT] Cache = no is set in main.conf. > It is simply the same because the device is held as temporary device. > > Additionally the method "dev_property_get_uuids" in device.c only returns UUIDs of > the cached (temporary hold) device because dev->le_state.svc_resolved is not turned > to false on disconnect. So if a disconnected device advertised an new UUID, you never > get notified about it through dbus. > > Through DBus device node I would expect to get both UUID lists. The cached ones and > also the advertised ones. > Actually I just merge the two lists and provide the result to DBus device->UUIDs request. > > Hope you can change this. > This series has already been applied, so it can't be changed. If you are still having problems after this series, can you share some logs so that we can see exactly the problem?
diff --git a/src/device.c b/src/device.c index 807106812..53ef3e9a1 100644 --- a/src/device.c +++ b/src/device.c @@ -3129,6 +3129,9 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type) device_update_last_seen(device, bdaddr_type); + g_slist_free_full(device->eir_uuids, g_free); + device->eir_uuids = NULL; + g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE, "Connected");
The eir_uuids list contains GATT service UUIDs from advertising data. The device may advertise different UUIDs each time it is scanned and connected, so the list needs to be cleared when the device disconnects. This partially fixes an issue where the UUIDs D-Bus property is empty after scanning, connecting, disconnecting and scanning again when [GATT] Cache = yes is set in main.conf. Issue: https://github.com/bluez/bluez/issues/192 Signed-off-by: David Lechner <david@lechnology.com> --- src/device.c | 3 +++ 1 file changed, 3 insertions(+)