From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
RemoveDevice causes the device to disconnect when connected but that
would result in calling set_temporary_timer with 0 timeout which would
only clear the timer but it doesn't program a timeout so
device_disappeared is never called, so instead of using temporary
timeout to cleanup this passes a variable which is set when to indicate
that the device shall be removed.
---
src/adapter.c | 9 ++++++++-
src/device.c | 7 ++++---
src/device.h | 3 ++-
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/adapter.c b/src/adapter.c
index afefa1d5d..43884cf15 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7171,6 +7171,8 @@ static void adapter_remove_connection(struct btd_adapter *adapter,
struct btd_device *device,
uint8_t bdaddr_type)
{
+ bool remove;
+
DBG("");
if (!g_slist_find(adapter->connections, device)) {
@@ -7178,7 +7180,12 @@ static void adapter_remove_connection(struct btd_adapter *adapter,
return;
}
- device_remove_connection(device, bdaddr_type);
+ device_remove_connection(device, bdaddr_type, &remove);
+
+ if (remove) {
+ btd_adapter_remove_device(adapter, device);
+ return;
+ }
if (device_is_authenticating(device))
device_cancel_authentication(device, TRUE);
diff --git a/src/device.c b/src/device.c
index 7b451e458..24b49ed79 100644
--- a/src/device.c
+++ b/src/device.c
@@ -3073,7 +3073,8 @@ static void set_temporary_timer(struct btd_device *dev, unsigned int timeout)
dev, NULL);
}
-void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
+void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
+ bool *remove)
{
struct bearer_state *state = get_state(device, bdaddr_type);
DBusMessage *reply;
@@ -3158,8 +3159,8 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type)
g_dbus_emit_property_changed(dbus_conn, device->path,
DEVICE_INTERFACE, "Connected");
- if (remove_device)
- set_temporary_timer(device, 0);
+ if (remove_device && remove)
+ *remove = true;
}
guint device_add_disconnect_watch(struct btd_device *device,
diff --git a/src/device.h b/src/device.h
index 960255d2b..d7f886224 100644
--- a/src/device.h
+++ b/src/device.h
@@ -123,7 +123,8 @@ int device_notify_pincode(struct btd_device *device, gboolean secure,
void device_cancel_authentication(struct btd_device *device, gboolean aborted);
gboolean device_is_authenticating(struct btd_device *device);
void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type);
-void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type);
+void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type,
+ bool *remove);
void device_request_disconnect(struct btd_device *device, DBusMessage *msg);
bool device_is_disconnecting(struct btd_device *device);
void device_set_ltk_enc_size(struct btd_device *device, uint8_t enc_size);
--
2.35.3
