From patchwork Wed Jan 22 11:30:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 13947174 Received: from mslow1.mail.gandi.net (mslow1.mail.gandi.net [217.70.178.240]) (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 89A221BDA99 for ; Wed, 22 Jan 2025 11:52:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.178.240 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546770; cv=none; b=J72beEZOSPs2gt7c6NVhEH3PG5tJYTkzMkaM22zeYltdtBqrBDu0iAUc3DZwJHcgPz5sYuHJmGlv7QPlg34uxvXlq0CO3rjF9m0WlHfB2xB+wHEiUn8ruDz2ef3cElP1UFMoGwIUpKRCIVy0p41yiB9UQkSMhSl40GuP4HatIfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737546770; c=relaxed/simple; bh=adwv1cpkz69yCoZ/bwxSSLYFSoDU4xBjiuO34UsKFnY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KFVaQGG3YsXH+PoFKOTlXE0LhkG+Jg2Z8NX8W4NXVDKxLQQy+zESFZLGDzaS32tj9VnttAjhcb/TZgKwHaJ0cThdvHKS0FX53ekl8q/hmnjKifOA9c3G8mpt9/Ewr4l+U5YzYXrdqrxC+E/Bl+6ZQVoM2MIGdn4IlnFnkCOmZ0w= 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.178.240 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: from relay4-d.mail.gandi.net (unknown [217.70.183.196]) by mslow1.mail.gandi.net (Postfix) with ESMTP id 15067C2EAB for ; Wed, 22 Jan 2025 11:31:16 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 3FF3BE000E; Wed, 22 Jan 2025 11:31:08 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Cc: Bastien Nocera Subject: [PATCH v2 1/2] client: Add client-side error decoding Date: Wed, 22 Jan 2025 12:30:40 +0100 Message-ID: <20250122113103.1106793-2-hadess@hadess.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250122113103.1106793-1-hadess@hadess.net> References: <20250122113103.1106793-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-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 convert those to human-readable form. --- Makefile.tools | 2 ++ client/error.c | 36 ++++++++++++++++++++++++++++++++++++ client/error.h | 11 +++++++++++ 3 files changed, 49 insertions(+) create mode 100644 client/error.c create mode 100644 client/error.h diff --git a/Makefile.tools b/Makefile.tools index 0dca43327fdd..41b4b4f0545f 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.h \ + client/error.c \ client/gatt.h client/gatt.c \ client/admin.h client/admin.c \ client/player.h client/player.c \ diff --git a/client/error.c b/client/error.c new file mode 100644 index 000000000000..975e4030dfc0 --- /dev/null +++ b/client/error.c @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2025 Bastien Nocera + * + * + */ + +#include +#include +#include "error.h" + +struct { + const char *error_code; + const char *str; +} error_codes[] = { + { "br-connection-profile-unavailable", "Exhausted the list of BR/EDR profiles to connect to" }, + { "br-connection-busy", "Cannot connect, connection busy" }, + { "br-connection-adapter-not-powered", "Cannot connect, adapter is not powered" }, +}; + +const char *error_code_to_str(const char *error_code) +{ + unsigned int i; + + if (error_code == NULL) + return NULL; + + for (i = 0; i < G_N_ELEMENTS(error_codes); i++) { + if (g_str_equal(error_codes[i].error_code, error_code)) + return error_codes[i].str; + } + return error_code; +} diff --git a/client/error.h b/client/error.h new file mode 100644 index 000000000000..402117f3305b --- /dev/null +++ b/client/error.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * + * BlueZ - Bluetooth protocol stack for Linux + * + * Copyright (C) 2025 Bastien Nocera + * + * + */ + +const char *error_code_to_str(const char *error_code);