From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v3 3/9] mgmt: Introduce mgmt_set_verbose
Date: Wed, 23 Mar 2022 13:13:35 -0700 [thread overview]
Message-ID: <20220323201341.3596128-4-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20220323201341.3596128-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This introduces mgmt_set_verbose which can be used to enable printing
the the likes hexdump of packets, by default it is disabled since in
most cases the hexdump is not very useful and there are better tools
to collect the hexdumo like btmon.
---
src/shared/mgmt.c | 24 ++++++++++++++++++++----
src/shared/mgmt.h | 1 +
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/shared/mgmt.c b/src/shared/mgmt.c
index c7e6a6c1d..cf518cc2b 100644
--- a/src/shared/mgmt.c
+++ b/src/shared/mgmt.c
@@ -50,6 +50,7 @@ struct mgmt {
mgmt_debug_func_t debug_callback;
mgmt_destroy_func_t debug_destroy;
void *debug_data;
+ bool verbose;
};
struct mgmt_request {
@@ -192,6 +193,15 @@ static void mgmt_log(struct mgmt *mgmt, const char *format, ...)
va_end(ap);
}
+static void mgmt_hexdump(struct mgmt *mgmt, char dir, const void *data,
+ size_t len)
+{
+ if (!mgmt->verbose)
+ return;
+
+ util_hexdump(dir, data, len, mgmt->debug_callback, mgmt->debug_data);
+}
+
static bool send_request(struct mgmt *mgmt, struct mgmt_request *request)
{
struct iovec iov;
@@ -219,8 +229,7 @@ static bool send_request(struct mgmt *mgmt, struct mgmt_request *request)
DBG(mgmt, "[0x%04x] command 0x%04x", request->index, request->opcode);
- util_hexdump('<', request->buf, ret, mgmt->debug_callback,
- mgmt->debug_data);
+ mgmt_hexdump(mgmt, '<', request->buf, ret);
queue_push_tail(mgmt->pending_list, request);
@@ -373,8 +382,7 @@ static bool can_read_data(struct io *io, void *user_data)
if (bytes_read < 0)
return false;
- util_hexdump('>', mgmt->buf, bytes_read,
- mgmt->debug_callback, mgmt->debug_data);
+ mgmt_hexdump(mgmt, '>', mgmt->buf, bytes_read);
if (bytes_read < MGMT_HDR_SIZE)
return true;
@@ -594,6 +602,14 @@ bool mgmt_set_debug(struct mgmt *mgmt, mgmt_debug_func_t callback,
return true;
}
+void mgmt_set_verbose(struct mgmt *mgmt, bool value)
+{
+ if (!mgmt)
+ return;
+
+ mgmt->verbose = value;
+}
+
bool mgmt_set_close_on_unref(struct mgmt *mgmt, bool do_close)
{
if (!mgmt)
diff --git a/src/shared/mgmt.h b/src/shared/mgmt.h
index b413cea78..0f3e54c16 100644
--- a/src/shared/mgmt.h
+++ b/src/shared/mgmt.h
@@ -28,6 +28,7 @@ typedef void (*mgmt_debug_func_t)(const char *str, void *user_data);
bool mgmt_set_debug(struct mgmt *mgmt, mgmt_debug_func_t callback,
void *user_data, mgmt_destroy_func_t destroy);
+void mgmt_set_verbose(struct mgmt *mgmt, bool value);
bool mgmt_set_close_on_unref(struct mgmt *mgmt, bool do_close);
--
2.35.1
next prev parent reply other threads:[~2022-03-23 20:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-23 20:13 [PATCH BlueZ v3 1/9] log: Don't log __FILE__ and __func__ with DBG_IDX Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v2 1/9] log: Introduce DBG_IS_ENABLED Luiz Augusto von Dentz
2022-03-24 1:53 ` [BlueZ,v2,1/9] " bluez.test.bot
2022-03-24 19:50 ` [PATCH BlueZ v2 1/9] " patchwork-bot+bluetooth
2022-03-23 20:13 ` [PATCH BlueZ v3 2/9] mgmt: Add DBG macro Luiz Augusto von Dentz
2022-03-23 20:13 ` Luiz Augusto von Dentz [this message]
2022-03-23 20:13 ` [PATCH BlueZ v3 4/9] adapter: Don't use DBG in mgmt_debug Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v3 5/9] att: Log file and function names Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v3 6/9] gatt-client: Add DBG macro Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v3 7/9] gatt-server: " Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v3 8/9] att: Rename att_debug and att_verbose to DBG and VERBOSE Luiz Augusto von Dentz
2022-03-23 20:13 ` [PATCH BlueZ v3 9/9] device: Don't use DBG in gatt_debug Luiz Augusto von Dentz
2022-03-23 21:48 ` [BlueZ,v3,1/9] log: Don't log __FILE__ and __func__ with DBG_IDX bluez.test.bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220323201341.3596128-4-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox