From patchwork Thu May 22 15:49:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 892269 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C3B6126BF1 for ; Thu, 22 May 2025 15:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; cv=none; b=UzWZCtha5h1whRGVV1zsyCNmwpERz9sNiF0O4cIebTv67Xn/sEAw8JhwPQJFkX2f0r/D6HZAlLvcAzrFO0RsK3Vqt9H90Aw69M56YSnmPtNgBrNqn+NFX1AMNH06hDSBbZmIVW+GdPTKRvn0QLgyNg/7KKnHlQWNZBDkRX1S004= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; c=relaxed/simple; bh=DwBpVz1Gh7yJEmEgzlZ6pZXz0T6sQCf5o3lc8veosNk=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Kk3CDzroBhj6S3U2w/trgNjCpZ+z28y4MQSzQ+U8zXLZHjVnGweRhO2jJQeBnqkjSUC42Mj8iyrkybOuVdNDL/YKkevZXxtsmKvKNrLxtRAgwyazNzP5XuHero1zsqqU0u1VJgWIkVg0EVvQKGornnghDsNNsklFwvpN8C7p2kA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=oA4wfIYp; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="oA4wfIYp" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1747928990; bh=DwBpVz1Gh7yJEmEgzlZ6pZXz0T6sQCf5o3lc8veosNk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=oA4wfIYp8NTE5t6fIO/AZnWhNlplqgO4vDoJ44Tuj5VHO/hDAYbNb6P0HoZ5GXGlK cL9N8DqRniHlnhXVkChEPxpMFrbyMtI3wrae8AlHBbQnDX0HlhWV9AzNY2euLYsFu4 8iiPjyeHyDxOr3urFsXYpZ+rzfZYvPVm5S53dM9um864owqbUBMX6tjbYRUXwmeKbZ YZznHvmnvsILM8LzakrLWxz37mXNImrfj4V1ba6M1mtJwnC99+GX3y3wGZZaLquwlD cIJIwi2ss560gVQKmMWzOsBkLdV22y+VN3WblLmCdVu+AxLG60fTmOSEKEOHnniDzI SXOTEFbJt9/9Q== Received: from fdanis-ThinkPad-X1.. (2A02-8428-aF44-1001-c115-20FF-2911-21D4.rev.sfr.net [IPv6:2a02:8428:af44:1001:c115:20ff:2911:21d4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 5311017E1576 for ; Thu, 22 May 2025 17:49:50 +0200 (CEST) From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v3 1/3] src/device: Add Disconnected signal to propagate disconnection reason Date: Thu, 22 May 2025 17:49:42 +0200 Message-ID: <20250522154944.665655-2-frederic.danis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522154944.665655-1-frederic.danis@collabora.com> References: <20250522154944.665655-1-frederic.danis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Currently a client application is informed of the disconnection by the update of the Connected property to false. This sends a Disconnected signal with the disconnection reason before the property is updated. This helps client application to know the reason for the disconnection and to take appropriate action. --- v1->v2: Propagate numerical reason instead of text one v2->v3: Replace numerical value by name and message to be more consistent with Device.Connect error reply. src/adapter.c | 13 +++++++----- src/device.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/device.h | 3 ++- 3 files changed, 65 insertions(+), 8 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index fd425e6d2..a10721489 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -7549,7 +7549,8 @@ struct agent *adapter_get_agent(struct btd_adapter *adapter) static void adapter_remove_connection(struct btd_adapter *adapter, struct btd_device *device, - uint8_t bdaddr_type) + uint8_t bdaddr_type, + uint8_t reason) { bool remove_device = false; @@ -7560,7 +7561,7 @@ static void adapter_remove_connection(struct btd_adapter *adapter, return; } - device_remove_connection(device, bdaddr_type, &remove_device); + device_remove_connection(device, bdaddr_type, &remove_device, reason); device_cancel_authentication(device, TRUE); @@ -7601,9 +7602,11 @@ static void adapter_stop(struct btd_adapter *adapter) struct btd_device *device = adapter->connections->data; uint8_t addr_type = btd_device_get_bdaddr_type(device); - adapter_remove_connection(adapter, device, BDADDR_BREDR); + adapter_remove_connection(adapter, device, BDADDR_BREDR, + MGMT_DEV_DISCONN_UNKNOWN); if (addr_type != BDADDR_BREDR) - adapter_remove_connection(adapter, device, addr_type); + adapter_remove_connection(adapter, device, addr_type, + MGMT_DEV_DISCONN_UNKNOWN); } g_dbus_emit_property_changed(dbus_conn, adapter->path, @@ -8551,7 +8554,7 @@ static void dev_disconnected(struct btd_adapter *adapter, device = btd_adapter_find_device(adapter, &addr->bdaddr, addr->type); if (device) { - adapter_remove_connection(adapter, device, addr->type); + adapter_remove_connection(adapter, device, addr->type, reason); disconnect_notify(device, reason); } diff --git a/src/device.c b/src/device.c index 56583f71a..9591fe0a7 100644 --- a/src/device.c +++ b/src/device.c @@ -3481,6 +3481,12 @@ static const GDBusMethodTable device_methods[] = { { } }; +static const GDBusSignalTable device_signals[] = { + { GDBUS_SIGNAL("Disconnected", + GDBUS_ARGS({ "name", "s" }, { "message", "s" })) }, + { } +}; + static gboolean dev_property_get_prefer_bearer(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) @@ -3732,8 +3738,53 @@ static void set_temporary_timer(struct btd_device *dev, unsigned int timeout) dev, NULL); } +static void emit_disconnect_reason(struct btd_device *device, + uint8_t reason) +{ + const char *name; + const char *message; + + switch (reason) { + case MGMT_DEV_DISCONN_UNKNOWN: + name = "org.bluez.Reason.Unknown"; + message = "disconnection-unknown"; + break; + case MGMT_DEV_DISCONN_TIMEOUT: + name = "org.bluez.Reason.Timeout"; + message = "disconnection-timeout"; + break; + case MGMT_DEV_DISCONN_LOCAL_HOST: + name = "org.bluez.Reason.Local"; + message = "disconnection-localhost"; + break; + case MGMT_DEV_DISCONN_REMOTE: + name = "org.bluez.Reason.Remote"; + message = "disconnection-remote"; + break; + case MGMT_DEV_DISCONN_AUTH_FAILURE: + name = "org.bluez.Reason.Authentication"; + message = "disconnection-authentication-failure"; + break; + case MGMT_DEV_DISCONN_LOCAL_HOST_SUSPEND: + name = "org.bluez.Reason.LocalSuspend"; + message = "disconnection-local-suspend"; + break; + default: + warn("Unknown disconnection value: %u", reason); + name = "org.bluez.Reason.Unknown"; + message = "disconnection-undefined"; + } + + g_dbus_emit_signal(dbus_conn, device->path, DEVICE_INTERFACE, + "Disconnected", + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &message, + DBUS_TYPE_INVALID); +} + void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type, - bool *remove) + bool *remove, + uint8_t reason) { struct bearer_state *state = get_state(device, bdaddr_type); DBusMessage *reply; @@ -3803,6 +3854,8 @@ void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type, g_slist_free_full(device->eir_uuids, g_free); device->eir_uuids = NULL; + emit_disconnect_reason(device, reason); + g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE, "Connected"); @@ -4704,7 +4757,7 @@ static struct btd_device *device_new(struct btd_adapter *adapter, if (g_dbus_register_interface(dbus_conn, device->path, DEVICE_INTERFACE, - device_methods, NULL, + device_methods, device_signals, device_properties, device, device_free) == FALSE) { error("Unable to register device interface for %s", address); diff --git a/src/device.h b/src/device.h index a35bb1386..4eebcebe9 100644 --- a/src/device.h +++ b/src/device.h @@ -134,7 +134,8 @@ gboolean device_is_authenticating(struct btd_device *device); void device_add_connection(struct btd_device *dev, uint8_t bdaddr_type, uint32_t flags); void device_remove_connection(struct btd_device *device, uint8_t bdaddr_type, - bool *remove); + bool *remove, + uint8_t reason); void device_request_disconnect(struct btd_device *device, DBusMessage *msg); bool device_is_disconnecting(struct btd_device *device); void device_set_ltk(struct btd_device *device, const uint8_t val[16], From patchwork Thu May 22 15:49:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 891780 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E26628A402 for ; Thu, 22 May 2025 15:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; cv=none; b=UOcimxVBgWk6ePHmKyJmdKhRmfNrwV1vCwN+sWl9cEAFv5RmrTccuAMBwEIuahaYZVmw8zXXcptZQZXNbu5w4Ki7q2j825ZEqmpluvvjeGr/hbO7hS5Had5+fMv6Z3eihjBhGr506CzjeMaugWE1hs8LYJwbkll+L77BfYocNrM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; c=relaxed/simple; bh=vVPxUDfLT+zq80E6y7maiE1cuSQVEa2zPhJsfchN3yo=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JxOQBiSCXahY804Q0VjAw/CdaUkmdVcm72MxX4TC9yGrRRsyRJ/r8mfmL6xssFdpclJsqh0x6eyh5DfadLYCmFQkhKiz4sHqqduNynyMPOyuUtpBxi+ALNd34XMnwOQDDfZH1e+ezQoOaGwFFN3AcRiCUWVQj57BDBb8H0InoSY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=fBVYvMs8; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="fBVYvMs8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1747928990; bh=vVPxUDfLT+zq80E6y7maiE1cuSQVEa2zPhJsfchN3yo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fBVYvMs8bbuIb934TKFAB5Nn1QoZ//gmxrz7GwOArEpi/SHPVusFvAycvg+xcZgAG CIP1/3fLhmOy99d3KxnFFSiX6egrnvSFd6p7Ybq3at8AsQNnn0ZOhUMbpmLZtS4VDt EOBAVBHT4HMNQrIRi/QB3SXaR57mFCT3O7J+/wHbZzzyp2PnYDVkivmJW4VIOjdd06 9YLJ0iV7ExS84zIAorukt4Sy07GdEhVJw91NEpkCnyPE/SenRkN0Q/c1ydNBA6bNRl zr7LXFTaq3Ii+xBTnUYYgOQfFuIOwxLQZEvFWaIREilalDjo9OybQ65+BkHw+rNJ4/ 1P9J2mqDknnDw== Received: from fdanis-ThinkPad-X1.. (2A02-8428-aF44-1001-c115-20FF-2911-21D4.rev.sfr.net [IPv6:2a02:8428:af44:1001:c115:20ff:2911:21d4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by bali.collaboradmins.com (Postfix) with ESMTPSA id 9B18117E1595 for ; Thu, 22 May 2025 17:49:50 +0200 (CEST) From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v3 2/3] doc/device: Add Disconnected signal Date: Thu, 22 May 2025 17:49:43 +0200 Message-ID: <20250522154944.665655-3-frederic.danis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522154944.665655-1-frederic.danis@collabora.com> References: <20250522154944.665655-1-frederic.danis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- v1->v2: Replace text reason by numerical reason Improve documentation v2->v3: Replace numerical reason by name and message doc/org.bluez.Device.rst | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/doc/org.bluez.Device.rst b/doc/org.bluez.Device.rst index 205f65761..39e51f79c 100644 --- a/doc/org.bluez.Device.rst +++ b/doc/org.bluez.Device.rst @@ -155,6 +155,47 @@ array{array{byte}} GetServiceRecords() [experimental] :org.bluez.Error.NotConnected: :org.bluez.Error.DoesNotExist: +Signals +------- + +void Disconnected(string name, string message) +`````````````````````````````````````````````` + + This signal is launched when a device is disconnected, with the reason of + the disconnection. + + This could be used by client application, depending on internal policy, to + try to reconnect to the device in case of timeout or unknown disconnection, + or to try to connect to another device. + + Possible reasons: + + :org.bluez.Reason.Unknown: + + :org.bluez.Reason.Timeout: + + The link supervision timeout has expired for a connection or the + synchronization timeout has expired for a broadcast. + + :org.bluez.Reason.Local: + + The local device terminated the connection, terminated synchronization + with a broadcaster, or terminated broadcasting packets. + + :org.bluez.Reason.Remote: + + This disconnection can be due to: + - the user on the remote device either terminated the connection + or stopped broadcasting packets, + - the remote device terminated the connection because of low + resources, + - the remote device terminated the connection because the device + is about to power off. + + :org.bluez.Reason.Authentication: + + :org.bluez.Reason.LocalSuspend: + Properties ---------- From patchwork Thu May 22 15:49:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 891779 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF98B28A730 for ; Thu, 22 May 2025 15:49:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; cv=none; b=rIw2c8+5hVAPRVyJ83f+xHJ393aOoQPKZ68ik6xQ1DI46n2x8B0o5JjUVnrsLglkdh6mtlOiC7Nw//q84lcF7p1nY4Ud9dOcp8f9hwO4NKcYAb4jCpWXx8j3uTTKSKGQWkJzaBhOcKbqSJOF3A+/wx29/q2o1+1/WvtYFvyaqTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747928994; c=relaxed/simple; bh=na7Y02ecD1oxrR+MRifSIfV6Bqovr2hhuk3h0MWZ7Qw=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u5GmKqAZ+Hy6wUROgdyPmyvWKJTh7mZJG8uO6Jvme5mKzseZPGz223VGyDfs0AsvdyYWtHLbr0PgwAb6N1Y7WYrEw5rA1IVJUD51ulSrlPNTDcY1z7xrv0Xg2By+Rq0gvOGTyxCjwERiq6ZBGeJj6fieM/qr88CHeD6Q0v3exqY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=o6wE4IzO; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="o6wE4IzO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1747928991; bh=na7Y02ecD1oxrR+MRifSIfV6Bqovr2hhuk3h0MWZ7Qw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=o6wE4IzOWhBSQMhr+nd9QAl1r4ew9CGis+A4cYoI+QvQ6nGwhdKq571uAHu6hHUqG 5uYt0+13gDPP6FzAb5+GPc6eFmMnrtpwATLoTu4A7Pe570tBoUfxZsiW41kNy/rbWV hwe1JBtSkkjT/aqmzqHh5P+qMCcET49R0gGiU/RMZUyA8C6rnNECH3aoWu8JNEwncu KjBCxQYaOE3m5ZhBoyDXJ7B3wUP5EyVZHuox73cJ1M+nqyhTLNHo7qq3O7Ry1n6ZvB MGFK6AZbR5lzOWkJsTflEVbPXr8JOjZCopmFTQHSsxACRA7L+jrPbq6VGSdxvlZtas vFpvHf1OLL9WQ== Received: from fdanis-ThinkPad-X1.. (2A02-8428-aF44-1001-c115-20FF-2911-21D4.rev.sfr.net [IPv6:2a02:8428:af44:1001:c115:20ff:2911:21d4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: fdanis) by bali.collaboradmins.com (Postfix) with ESMTPSA id E356417E159D for ; Thu, 22 May 2025 17:49:50 +0200 (CEST) From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v3 3/3] client: Display disconnection reason Date: Thu, 22 May 2025 17:49:44 +0200 Message-ID: <20250522154944.665655-4-frederic.danis@collabora.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250522154944.665655-1-frederic.danis@collabora.com> References: <20250522154944.665655-1-frederic.danis@collabora.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The new org.bluez.Device1.Disconnected signal propagates the disconnection reason. --- v1->v2: Display disconnect reason in numerical and text v2->v3: Display disconnect reason name and message instead of numerical value client/main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/client/main.c b/client/main.c index ad35ae1fb..14d5686fb 100644 --- a/client/main.c +++ b/client/main.c @@ -709,6 +709,24 @@ static void property_changed(GDBusProxy *proxy, const char *name, static void message_handler(DBusConnection *connection, DBusMessage *message, void *user_data) { + if (!strcmp(dbus_message_get_member(message), "Disconnected")) { + const char *name; + const char *msg; + + if (!dbus_message_get_args(message, NULL, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &msg, + DBUS_TYPE_INVALID)) + goto failed; + + bt_shell_printf("[SIGNAL] %s.%s %s %s\n", + dbus_message_get_interface(message), + dbus_message_get_member(message), + name, msg); + return; + } + +failed: bt_shell_printf("[SIGNAL] %s.%s\n", dbus_message_get_interface(message), dbus_message_get_member(message)); }