* [PATCH BlueZ] gatt: Fix not cleaning up device state properly
@ 2018-10-01 11:13 Luiz Augusto von Dentz
2018-10-01 11:44 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2018-10-01 11:13 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
If the device is removed locally device_free would end up calling
bt_att_unref which won't trigger any disconnect callback necessary
to remove device states.
---
src/device.c | 3 +++
src/gatt-database.c | 24 ++++++++++++++++++++++++
src/gatt-database.h | 2 ++
3 files changed, 29 insertions(+)
diff --git a/src/device.c b/src/device.c
index ef5b8f86a..5ddfb9266 100644
--- a/src/device.c
+++ b/src/device.c
@@ -580,6 +580,9 @@ static void gatt_server_cleanup(struct btd_device *device)
bt_gatt_server_unref(device->server);
device->server = NULL;
+
+ btd_gatt_database_att_disconnected(
+ btd_adapter_get_database(device->adapter), device->att);
}
static void attio_cleanup(struct btd_device *device)
diff --git a/src/gatt-database.c b/src/gatt-database.c
index abcf7b759..bdabcb4d6 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -3349,6 +3349,30 @@ void btd_gatt_database_att_connected(struct btd_gatt_database *database,
state->pending = NULL;
}
+void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
+ struct bt_att *att)
+{
+ struct device_state *state;
+ bdaddr_t bdaddr;
+ uint8_t bdaddr_type;
+
+ DBG("");
+
+ if (!get_dst_info(att, &bdaddr, &bdaddr_type))
+ return;
+
+ state = find_device_state(database, &bdaddr, bdaddr_type);
+ if (!state)
+ return;
+
+ if (state->disc_id) {
+ bt_att_unregister_disconnect(att, state->disc_id);
+ state->disc_id = 0;
+ }
+
+ att_disconnected(0, state);
+}
+
static void restore_ccc(struct btd_gatt_database *database,
const bdaddr_t *addr, uint8_t addr_type, uint16_t value)
{
diff --git a/src/gatt-database.h b/src/gatt-database.h
index a6c3139c4..9e7cda8c2 100644
--- a/src/gatt-database.h
+++ b/src/gatt-database.h
@@ -25,5 +25,7 @@ void btd_gatt_database_destroy(struct btd_gatt_database *database);
struct gatt_db *btd_gatt_database_get_db(struct btd_gatt_database *database);
void btd_gatt_database_att_connected(struct btd_gatt_database *database,
struct bt_att *att);
+void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
+ struct bt_att *att);
void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database);
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH BlueZ] gatt: Fix not cleaning up device state properly
2018-10-01 11:13 [PATCH BlueZ] gatt: Fix not cleaning up device state properly Luiz Augusto von Dentz
@ 2018-10-01 11:44 ` Luiz Augusto von Dentz
2018-10-01 18:31 ` Sukesh Srikakula
0 siblings, 1 reply; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2018-10-01 11:44 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Yunhan Wang, Sukesh Srikakula
On Mon, Oct 1, 2018 at 2:13 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> If the device is removed locally device_free would end up calling
> bt_att_unref which won't trigger any disconnect callback necessary
> to remove device states.
> ---
> src/device.c | 3 +++
> src/gatt-database.c | 24 ++++++++++++++++++++++++
> src/gatt-database.h | 2 ++
> 3 files changed, 29 insertions(+)
>
> diff --git a/src/device.c b/src/device.c
> index ef5b8f86a..5ddfb9266 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -580,6 +580,9 @@ static void gatt_server_cleanup(struct btd_device *device)
>
> bt_gatt_server_unref(device->server);
> device->server = NULL;
> +
> + btd_gatt_database_att_disconnected(
> + btd_adapter_get_database(device->adapter), device->att);
> }
>
> static void attio_cleanup(struct btd_device *device)
> diff --git a/src/gatt-database.c b/src/gatt-database.c
> index abcf7b759..bdabcb4d6 100644
> --- a/src/gatt-database.c
> +++ b/src/gatt-database.c
> @@ -3349,6 +3349,30 @@ void btd_gatt_database_att_connected(struct btd_gatt_database *database,
> state->pending = NULL;
> }
>
> +void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
> + struct bt_att *att)
> +{
> + struct device_state *state;
> + bdaddr_t bdaddr;
> + uint8_t bdaddr_type;
> +
> + DBG("");
> +
> + if (!get_dst_info(att, &bdaddr, &bdaddr_type))
> + return;
> +
> + state = find_device_state(database, &bdaddr, bdaddr_type);
> + if (!state)
> + return;
> +
> + if (state->disc_id) {
> + bt_att_unregister_disconnect(att, state->disc_id);
> + state->disc_id = 0;
> + }
> +
> + att_disconnected(0, state);
> +}
> +
> static void restore_ccc(struct btd_gatt_database *database,
> const bdaddr_t *addr, uint8_t addr_type, uint16_t value)
> {
> diff --git a/src/gatt-database.h b/src/gatt-database.h
> index a6c3139c4..9e7cda8c2 100644
> --- a/src/gatt-database.h
> +++ b/src/gatt-database.h
> @@ -25,5 +25,7 @@ void btd_gatt_database_destroy(struct btd_gatt_database *database);
> struct gatt_db *btd_gatt_database_get_db(struct btd_gatt_database *database);
> void btd_gatt_database_att_connected(struct btd_gatt_database *database,
> struct bt_att *att);
> +void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
> + struct bt_att *att);
>
> void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database);
> --
> 2.17.1
>
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH BlueZ] gatt: Fix not cleaning up device state properly
2018-10-01 11:44 ` Luiz Augusto von Dentz
@ 2018-10-01 18:31 ` Sukesh Srikakula
0 siblings, 0 replies; 3+ messages in thread
From: Sukesh Srikakula @ 2018-10-01 18:31 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth, Yunhan Wang
Hi Luiz,
Thanks for the patch.
But, I am still seeing the issue even after applying the patch.
btd_gatt_database_att_disconnected() is bailing out at the first
check, get_dst_info(). So, att_disconnected() is not getting called.
Here is the log message
daemon.debug bluetoothd[3913]:
src/gatt-database.c:btd_gatt_database_att_disconnected()
daemon.err bluetoothd[3913]: gatt: bt_io_get: getpeername: Transport
endpoint is not connected (107)
daemon.debug bluetoothd[3913]: attrib/gattrib.c:g_attrib_unref()
0x20669f0: g_attrib_unref=0
daemon.debug bluetoothd[3913]: src/device.c:device_free() 0x2064518
daemon.debug bluetoothd[3913]: plugins/policy.c:disconnect_cb() reason 3
daemon.debug bluetoothd[3913]:
src/adapter.c:bonding_attempt_complete() hci0 bdaddr 7B:01:A4:6B:09:2C
type 2 status 0xe
daemon.debug bluetoothd[3913]: src/adapter.c:resume_discovery()
Regards,
Sukesh.
On Mon, Oct 1, 2018 at 4:44 AM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> On Mon, Oct 1, 2018 at 2:13 PM, Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
>> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>>
>> If the device is removed locally device_free would end up calling
>> bt_att_unref which won't trigger any disconnect callback necessary
>> to remove device states.
>> ---
>> src/device.c | 3 +++
>> src/gatt-database.c | 24 ++++++++++++++++++++++++
>> src/gatt-database.h | 2 ++
>> 3 files changed, 29 insertions(+)
>>
>> diff --git a/src/device.c b/src/device.c
>> index ef5b8f86a..5ddfb9266 100644
>> --- a/src/device.c
>> +++ b/src/device.c
>> @@ -580,6 +580,9 @@ static void gatt_server_cleanup(struct btd_device *device)
>>
>> bt_gatt_server_unref(device->server);
>> device->server = NULL;
>> +
>> + btd_gatt_database_att_disconnected(
>> + btd_adapter_get_database(device->adapter), device->att);
>> }
>>
>> static void attio_cleanup(struct btd_device *device)
>> diff --git a/src/gatt-database.c b/src/gatt-database.c
>> index abcf7b759..bdabcb4d6 100644
>> --- a/src/gatt-database.c
>> +++ b/src/gatt-database.c
>> @@ -3349,6 +3349,30 @@ void btd_gatt_database_att_connected(struct btd_gatt_database *database,
>> state->pending = NULL;
>> }
>>
>> +void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
>> + struct bt_att *att)
>> +{
>> + struct device_state *state;
>> + bdaddr_t bdaddr;
>> + uint8_t bdaddr_type;
>> +
>> + DBG("");
>> +
>> + if (!get_dst_info(att, &bdaddr, &bdaddr_type))
>> + return;
>> +
>> + state = find_device_state(database, &bdaddr, bdaddr_type);
>> + if (!state)
>> + return;
>> +
>> + if (state->disc_id) {
>> + bt_att_unregister_disconnect(att, state->disc_id);
>> + state->disc_id = 0;
>> + }
>> +
>> + att_disconnected(0, state);
>> +}
>> +
>> static void restore_ccc(struct btd_gatt_database *database,
>> const bdaddr_t *addr, uint8_t addr_type, uint16_t value)
>> {
>> diff --git a/src/gatt-database.h b/src/gatt-database.h
>> index a6c3139c4..9e7cda8c2 100644
>> --- a/src/gatt-database.h
>> +++ b/src/gatt-database.h
>> @@ -25,5 +25,7 @@ void btd_gatt_database_destroy(struct btd_gatt_database *database);
>> struct gatt_db *btd_gatt_database_get_db(struct btd_gatt_database *database);
>> void btd_gatt_database_att_connected(struct btd_gatt_database *database,
>> struct bt_att *att);
>> +void btd_gatt_database_att_disconnected(struct btd_gatt_database *database,
>> + struct bt_att *att);
>>
>> void btd_gatt_database_restore_svc_chng_ccc(struct btd_gatt_database *database);
>> --
>> 2.17.1
>>
>
>
>
> --
> Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-01 18:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-01 11:13 [PATCH BlueZ] gatt: Fix not cleaning up device state properly Luiz Augusto von Dentz
2018-10-01 11:44 ` Luiz Augusto von Dentz
2018-10-01 18:31 ` Sukesh Srikakula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).