2022-03-23 23:18:08

by Luiz Augusto von Dentz

Subject: [PATCH BlueZ v4 3/9] mgmt: Introduce mgmt_set_verbose

From: Luiz Augusto von Dentz <[email protected]>

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

2022-03-25 19:11:45

by Marcel Holtmann

Subject: Re: [PATCH BlueZ v4 3/9] mgmt: Introduce mgmt_set_verbose

Hi Luiz,

> 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);
> +}
> +

this is stupid, lets just remove the support for hexdump altogether here. This code was written when mgmt tracing via btmon was not available, but since it is now, there is really no point.

Regards

Marcel