From patchwork Tue May 20 13:26:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 892278 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 1496622D794 for ; Tue, 20 May 2025 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747658; cv=none; b=WveL1h9R4Pkb3GKi4SI9hjkXLDef6kd/kOyF9hR/xBlggHqhiyLxNE4cVwDje2U6caKeRFrjlaYqRJI8Th+Td0cjXAnHdHgm1B+QZbJ9B1JYYQ0GNFFHYcLdlPBI4mmFF3c/37k5d1ytuuixMQv3q1B3xFpxxR5dBp/uE+GFhwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747658; c=relaxed/simple; bh=9gmKhuZ8BmjU8wEpq26PBWx+Zm0yTHLuPJqRTTpwAXU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=naPd77MvLjDvcYi9VCBWxLeo8mw4aqZQORAc7t4VsyLiK0t9eh1hjeYrz5JzYo/tSwKiATS36EEf63FAaFaD5RSuWUqycID/YE97KFomAvoQ0cQ2RJoq4JB1IzeN3PpJ+xmiF79zDqNAs/U9A0sNTvMVgo7XP6qqe/OpGkfO2m8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net; spf=pass smtp.mailfrom=hadess.net; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hadess.net Received: by mail.gandi.net (Postfix) with ESMTPSA id 1528843A21; Tue, 20 May 2025 13:27:33 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Cc: Bastien Nocera Subject: [PATCH BlueZ v3 1/4] client: Add client-side error decoding Date: Tue, 20 May 2025 15:26:33 +0200 Message-ID: <20250520132733.1746996-1-hadess@hadess.net> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-State: clean X-GND-Score: 0 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdeffecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeeurghsthhivghnucfpohgtvghrrgcuoehhrgguvghssheshhgruggvshhsrdhnvghtqeenucggtffrrghtthgvrhhnpeffteektdejuddvhfdtfedtvdetgeeileethfetgfdtheekvefgueeifffhvefhfeenucfkphepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefpdhhvghlohepohhlihhmphhitgdrrddpmhgrihhlfhhrohhmpehhrgguvghssheshhgruggvshhsrdhnvghtpdhnsggprhgtphhtthhopedvpdhrtghpthhtoheplhhinhhugidqsghluhgvthhoohhthhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehhrgguvghssheshhgruggvshhsrdhnvght X-GND-Sasl: hadess@hadess.net The D-Bus errors returned in a number of cases aren't in human-readable form, but instead exist as "codes" (listed in src/error.h). This new function will allow us to split a specifically formatted string into a human-readable message and an error code. --- Makefile.tools | 2 + client/error-parse.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ client/error-parse.h | 12 ++++++ 3 files changed, 103 insertions(+) create mode 100644 client/error-parse.c create mode 100644 client/error-parse.h diff --git a/Makefile.tools b/Makefile.tools index e60c31b1d907..27346f1368a2 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -10,6 +10,8 @@ client_bluetoothctl_SOURCES = client/main.c \ client/advertising.c \ client/adv_monitor.h \ client/adv_monitor.c \ + client/error-parse.h \ + client/error-parse.c \ client/gatt.h client/gatt.c \ client/admin.h client/admin.c \ client/player.h client/player.c \ diff --git a/client/error-parse.c b/client/error-parse.c new file mode 100644 index 000000000000..782d63f625f9 --- /dev/null +++ b/client/error-parse.c @@ -0,0 +1,89 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2025 Bastien Nocera + * + * + */ + +#include +#include +#include "src/error.h" +#include "error-parse.h" + +const char *error_codes[] = { + ERR_BREDR_CONN_ALREADY_CONNECTED, + ERR_BREDR_CONN_PAGE_TIMEOUT, + ERR_BREDR_CONN_PROFILE_UNAVAILABLE, + ERR_BREDR_CONN_SDP_SEARCH, + ERR_BREDR_CONN_CREATE_SOCKET, + ERR_BREDR_CONN_INVALID_ARGUMENTS, + ERR_BREDR_CONN_ADAPTER_NOT_POWERED, + ERR_BREDR_CONN_NOT_SUPPORTED, + ERR_BREDR_CONN_BAD_SOCKET, + ERR_BREDR_CONN_MEMORY_ALLOC, + ERR_BREDR_CONN_BUSY, + ERR_BREDR_CONN_CNCR_CONNECT_LIMIT, + ERR_BREDR_CONN_TIMEOUT, + ERR_BREDR_CONN_REFUSED, + ERR_BREDR_CONN_ABORT_BY_REMOTE, + ERR_BREDR_CONN_ABORT_BY_LOCAL, + ERR_BREDR_CONN_LMP_PROTO_ERROR, + ERR_BREDR_CONN_CANCELED, + ERR_BREDR_CONN_KEY_MISSING, + ERR_BREDR_CONN_UNKNOWN, + ERR_LE_CONN_INVALID_ARGUMENTS, + ERR_LE_CONN_ADAPTER_NOT_POWERED, + ERR_LE_CONN_NOT_SUPPORTED, + ERR_LE_CONN_ALREADY_CONNECTED, + ERR_LE_CONN_BAD_SOCKET, + ERR_LE_CONN_MEMORY_ALLOC, + ERR_LE_CONN_BUSY, + ERR_LE_CONN_REFUSED, + ERR_LE_CONN_CREATE_SOCKET, + ERR_LE_CONN_TIMEOUT, + ERR_LE_CONN_SYNC_CONNECT_LIMIT, + ERR_LE_CONN_ABORT_BY_REMOTE, + ERR_LE_CONN_ABORT_BY_LOCAL, + ERR_LE_CONN_LL_PROTO_ERROR, + ERR_LE_CONN_GATT_BROWSE, + ERR_LE_CONN_KEY_MISSING, + ERR_LE_CONN_UNKNOWN +}; + +#define MIN_ERROR_MSG_LEN 4 + +/* Parse formatted combined error code + user-readable error + * string into its components. + * Format is ":code:message" */ +const char *detailed_error_parse(const char *error_msg, + const char **error_code) +{ + const char *second_colon; + unsigned int i; + + if (error_msg == NULL) + goto out; + + if (*error_msg != ':') + goto out; + if (strlen(error_msg) < MIN_ERROR_MSG_LEN) + goto out; + + second_colon = strchr(error_msg + 1, ':'); + if (second_colon == NULL) + goto out; + + for (i = 0; i < G_N_ELEMENTS(error_codes); i++) { + if (strncmp(error_codes[i], error_msg + 1, (size_t)(second_colon - 1 - error_msg)) == 0) { + if (error_code != NULL) + *error_code = error_codes[i]; + return second_colon + 1; + } + } + +out: + return error_msg; +} diff --git a/client/error-parse.h b/client/error-parse.h new file mode 100644 index 000000000000..c983982232f1 --- /dev/null +++ b/client/error-parse.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2025 Bastien Nocera + * + * + */ + +const char *detailed_error_parse(const char *error_msg, + const char **error_code); From patchwork Tue May 20 13:26:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 891374 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 69BC91ACECE for ; Tue, 20 May 2025 13:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747658; cv=none; b=UEqpIWz6nAvnVdyzHnLqAlqMQMYg3Pyr7/fV3Bn+hXCFlntFOpJ9ZGl5foKQbVTBlRsK8jiTohy+9+KidpOUnKBReiOv+uzWPcJfEHSYpn0pQ04kS9zh5UoeuL3PpEpeVZrOERcOC7qqYZGECPEnj1i9l/ad+YI+caAVLKMGc0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747658; c=relaxed/simple; bh=D36PsCXleWazhHyYKxneEcKcbwQatHMRcr2rdQmzupY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=atOnFzC+FSZvQQlF82YcySJdWr1CtvIR6wAFp0S/L9L3OfzszWcbGU78k2gP6D8kkuT3hxT79TItFaQFC5dC8WnUSdg0Q0OgsggXW7CiCbj7DeWbEfkxEFEokYsk1LZhnZpRdh5bWhGErAt9nHI8WEWYA/nxKxcTXOLlfK1CrJU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net; spf=pass smtp.mailfrom=hadess.net; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hadess.net Received: by mail.gandi.net (Postfix) with ESMTPSA id 66C3B43990; Tue, 20 May 2025 13:27:34 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Cc: Bastien Nocera Subject: [PATCH BlueZ v3 2/4] client: Print a human readable error message Date: Tue, 20 May 2025 15:26:34 +0200 Message-ID: <20250520132733.1746996-2-hadess@hadess.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520132733.1746996-1-hadess@hadess.net> References: <20250520132733.1746996-1-hadess@hadess.net> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-State: clean X-GND-Score: 0 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdeffecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeurghsthhivghnucfpohgtvghrrgcuoehhrgguvghssheshhgruggvshhsrdhnvghtqeenucggtffrrghtthgvrhhnpeevtefhleevjeffteekleehheeujeelhfdvheethefggefhkefgvdefhfegkeeiteenucfkphepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefpdhhvghlohepohhlihhmphhitgdrrddpmhgrihhlfhhrohhmpehhrgguvghssheshhgruggvshhsrdhnvghtpdhnsggprhgtphhtthhopedvpdhrtghpthhtoheplhhinhhugidqsghluhgvthhoohhthhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehhrgguvghssheshhgruggvshhsrdhnvght X-GND-Sasl: hadess@hadess.net When the D-Bus error message string contains an encoded error code and user-readable message, parse this message to only show the user-readable message. --- client/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.c b/client/main.c index 5d53a7be11e4..122d975a08da 100644 --- a/client/main.c +++ b/client/main.c @@ -30,6 +30,7 @@ #include "gdbus/gdbus.h" #include "print.h" #include "agent.h" +#include "error-parse.h" #include "gatt.h" #include "advertising.h" #include "adv_monitor.h" @@ -2013,8 +2014,9 @@ static void connect_reply(DBusMessage *message, void *user_data) g_free(data); if (dbus_set_error_from_message(&error, message) == TRUE) { - bt_shell_printf("Failed to connect: %s %s\n", error.name, - error.message); + const char *msg = detailed_error_parse(error.message, NULL); + bt_shell_printf("Failed to connect: %s: %s\n", error.name, + msg); dbus_error_free(&error); return bt_shell_noninteractive_quit(EXIT_FAILURE); } From patchwork Tue May 20 13:26:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 891373 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 69C3A241CA8 for ; Tue, 20 May 2025 13:27:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747659; cv=none; b=sTwGhQ0lXo5K2PGOfyuJA7NTjgwme7ec2xP8QoYFWzcGuHei+k4MDobEZlKjY124ujmHb9pc0kkydarcDxDYgLJO8d3R3Szrs3H0yDyJgs56WNvcAVg9XqHGDclQ9PvHPoSskJ6EpwOqEldsL8VJhchhMz4xHUSnFk3dKMiY1sk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747659; c=relaxed/simple; bh=fmEvO9jWgHIksPyAwWC/7NPn09ezbJkAFNR3cGcEPkI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hLlKDQ/WRn7WULqS8uNZPhcCBFTKiuA5kVfXnv846IAiiAPV/BCDd1PsxRw/k1wIcN0sNt5iAhESjpgeZFs5InzUCcp+kp1RlwFgXnVJdn6Ef96ASz3L0CFEbHWSXRG5LEzO6Owp17sDjp4YpL3H4sPIiAaPnDh8UrCSeBBih4Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net; spf=pass smtp.mailfrom=hadess.net; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hadess.net Received: by mail.gandi.net (Postfix) with ESMTPSA id B11B843E95; Tue, 20 May 2025 13:27:34 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Cc: Bastien Nocera Subject: [PATCH BlueZ v3 3/4] device: Better "Connect" debug Date: Tue, 20 May 2025 15:26:35 +0200 Message-ID: <20250520132733.1746996-3-hadess@hadess.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520132733.1746996-1-hadess@hadess.net> References: <20250520132733.1746996-1-hadess@hadess.net> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-State: clean X-GND-Score: 0 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdeffecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeurghsthhivghnucfpohgtvghrrgcuoehhrgguvghssheshhgruggvshhsrdhnvghtqeenucggtffrrghtthgvrhhnpeevtefhleevjeffteekleehheeujeelhfdvheethefggefhkefgvdefhfegkeeiteenucfkphepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefpdhhvghlohepohhlihhmphhitgdrrddpmhgrihhlfhhrohhmpehhrgguvghssheshhgruggvshhsrdhnvghtpdhnsggprhgtphhtthhopedvpdhrtghpthhtoheplhhinhhugidqsghluhgvthhoohhthhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehhrgguvghssheshhgruggvshhsrdhnvght X-GND-Sasl: hadess@hadess.net Output clearer debug information so that it's possible to follow the decisions made by the bluetoothd daemon when a client such as bluetoothctl or the GNOME Bluetooth settings ask it to connect to a device. --- src/device.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/src/device.c b/src/device.c index d230af0a8aaa..0797e5ff5bb8 100644 --- a/src/device.c +++ b/src/device.c @@ -2560,6 +2560,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type "Connect") && find_service_with_state(dev->services, BTD_SERVICE_STATE_CONNECTED)) { + DBG("Already connected to services"); return dbus_message_new_method_return(msg); } else { return btd_error_not_available_str(msg, @@ -2572,8 +2573,10 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type err = connect_next(dev); if (err < 0) { - if (err == -EALREADY) + if (err == -EALREADY) { + DBG("Already connected"); return dbus_message_new_method_return(msg); + } return btd_error_failed(msg, btd_error_bredr_conn_from_errno(err)); } @@ -2648,14 +2651,24 @@ static uint8_t select_conn_bearer(struct btd_device *dev) return dev->bdaddr_type; } +static const char *bdaddr_type_strs[] = { + "BR/EDR", + "LE public", + "LE random" +}; + static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg, void *user_data) { struct btd_device *dev = user_data; uint8_t bdaddr_type; - if (dev->bonding) + DBG("Calling \"Connect\" for device %s", dev->path); + + if (dev->bonding) { + DBG("Bonding in progress"); return btd_error_in_progress(msg); + } if (dev->bredr_state.connected) { /* @@ -2664,23 +2677,35 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg, */ if (dev->bredr_state.svc_resolved && find_service_with_state(dev->services, - BTD_SERVICE_STATE_CONNECTED)) + BTD_SERVICE_STATE_CONNECTED)) { bdaddr_type = dev->bdaddr_type; - else + DBG("Selecting address type %s, as BR/EDR services are resolved " + " and connected", bdaddr_type_strs[dev->bdaddr_type]); + } else { bdaddr_type = BDADDR_BREDR; - } else if (dev->le_state.connected && dev->bredr) + DBG("Selecting address type BR/EDR, as services not resolved " + "or not connected"); + } + } else if (dev->le_state.connected && dev->bredr) { bdaddr_type = BDADDR_BREDR; - else + DBG("Selecting address type BR/EDR, as LE already connected"); + } else { bdaddr_type = select_conn_bearer(dev); + DBG("Selecting address type %s", bdaddr_type_strs[dev->bdaddr_type]); + } if (bdaddr_type != BDADDR_BREDR) { int err; - if (dev->connect) + if (dev->connect) { + DBG("Device already connecting"); return btd_error_in_progress(msg); + } - if (dev->le_state.connected) + if (dev->le_state.connected) { + DBG("Device already connected through LE"); return dbus_message_new_method_return(msg); + } btd_device_set_temporary(dev, false); From patchwork Tue May 20 13:26:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 892277 Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) (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 2C48E24290E for ; Tue, 20 May 2025 13:27:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747659; cv=none; b=c9bXSGAK303OaTZ6LaEaMcrmiMmXxMQZYBknxWDHb9Rur2M6K3zqLtrko2NNPi6A3n5EKRAHLSptPITE6rURLPLZq89rfuKr4eCBfFN2XYpdvAjrjgrei/DSeNxmpXgnRkJfhQzBlKVjAnK4OokBYcb4YJb4l8pXHrKV7zttZv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747747659; c=relaxed/simple; bh=cfPWuRmNT6ZeBonQ1PHQfFcPfbLLZz4Y78MuTFLiCW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cQM8q/YOnQoEHBd9m+A6XJ5TcNp7lcuXbeIja2Xw56svaONkdsoMWmAJbxn0fjD3qpuD4JlBRcoxvOCbfprnkXavWrybfdKt1sVV7Mtq0CosID/93rnntZJQ8WbwgvwmqvlTATaZnyeuLg+QEK4vEN8VOfh08jCNhtzkjAu0My8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net; spf=pass smtp.mailfrom=hadess.net; arc=none smtp.client-ip=217.70.183.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=hadess.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=hadess.net Received: by mail.gandi.net (Postfix) with ESMTPSA id 00FED439A5; Tue, 20 May 2025 13:27:34 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Cc: Bastien Nocera Subject: [PATCH BlueZ v3 4/4] device: Add user-readable messages for a number of errors Date: Tue, 20 May 2025 15:26:36 +0200 Message-ID: <20250520132733.1746996-4-hadess@hadess.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250520132733.1746996-1-hadess@hadess.net> References: <20250520132733.1746996-1-hadess@hadess.net> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-GND-State: clean X-GND-Score: 0 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddtgdeffecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfitefpfffkpdcuggftfghnshhusghstghrihgsvgenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeeurghsthhivghnucfpohgtvghrrgcuoehhrgguvghssheshhgruggvshhsrdhnvghtqeenucggtffrrghtthgvrhhnpeevtefhleevjeffteekleehheeujeelhfdvheethefggefhkefgvdefhfegkeeiteenucfkphepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepvdgrtddumegvfeegmegvtgejfeemtghfvddtmeejudgurgemfegsugemvddtrgelmedufeefpdhhvghlohepohhlihhmphhitgdrrddpmhgrihhlfhhrohhmpehhrgguvghssheshhgruggvshhsrdhnvghtpdhnsggprhgtphhtthhopedvpdhrtghpthhtoheplhhinhhugidqsghluhgvthhoohhthhesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehhrgguvghssheshhgruggvshhsrdhnvght X-GND-Sasl: hadess@hadess.net --- src/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/device.c b/src/device.c index 0797e5ff5bb8..d1023f762474 100644 --- a/src/device.c +++ b/src/device.c @@ -1922,9 +1922,9 @@ void device_request_disconnect(struct btd_device *device, DBusMessage *msg) DBusMessage *reply; if (device->bonding_status == MGMT_STATUS_AUTH_FAILED) - err_str = ERR_BREDR_CONN_KEY_MISSING; + err_str = ":" ERR_BREDR_CONN_KEY_MISSING ":Link key missing"; else - err_str = ERR_BREDR_CONN_CANCELED; + err_str = ":" ERR_BREDR_CONN_CANCELED ":Connection canceled"; reply = btd_error_failed(device->connect, err_str); g_dbus_send_message(dbus_conn, reply); dbus_message_unref(device->connect); @@ -2545,7 +2545,8 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type if (!btd_adapter_get_powered(dev->adapter)) { return btd_error_not_ready_str(msg, - ERR_BREDR_CONN_ADAPTER_NOT_POWERED); + ":" ERR_BREDR_CONN_ADAPTER_NOT_POWERED + ":Adapter not powered"); } btd_device_set_temporary(dev, false); @@ -2564,7 +2565,8 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type return dbus_message_new_method_return(msg); } else { return btd_error_not_available_str(msg, - ERR_BREDR_CONN_PROFILE_UNAVAILABLE); + ":" ERR_BREDR_CONN_PROFILE_UNAVAILABLE ":" + "Exhausted the list of BR/EDR profiles to connect to"); } }