2020-06-17 06:27:45

by Michael Sun

Subject: [bluez PATCH v2 2/3] btmgmt: Add command "remove" into "monitor" btmgmt submenu

This patch introduces a new btmgmt command ‘remove’ wihtin "monitor"
submenu to allow users to remove previously added filters along with a
event handler to handle kernel issued MGMT_EV_ADV_MONITOR_REMOVED
event. The command will work with the new
MGMT opcode MGMT_OP_REMOVE_ADV_MONITOR.

Reviewed-by: Alain Michaud <[email protected]>
Reviewed-by: Miao-chen Chou <[email protected]>
Signed-off-by: Michael Sun <[email protected]>
---

Changes in v2: None

tools/btmgmt.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)

diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index a0487d4de178..5a70e9e1c3e9 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -1013,6 +1013,19 @@ static void advertising_removed(uint16_t index, uint16_t len,
print("hci%u advertising_removed: instance %u", index, ev->instance);
}

+static void advmon_removed(uint16_t index, uint16_t len, const void *param,
+ void *user_data)
+{
+ const struct mgmt_ev_adv_monitor_removed *ev = param;
+
+ if (len < sizeof(*ev)) {
+ error("Too small (%u bytes) %s event", len, __func__);
+ return;
+ }
+
+ print("hci%u %s: handle %u", index, __func__, ev->monitor_handle);
+}
+
static void version_rsp(uint8_t status, uint16_t len, const void *param,
void *user_data)
{
@@ -4644,6 +4657,44 @@ static void cmd_advmon_features(int argc, char **argv)
}
}

+static void advmon_remove_rsp(uint8_t status, uint16_t len, const void *param,
+ void *user_data)
+{
+ const struct mgmt_rp_remove_adv_monitor *rp = param;
+
+ if (status != MGMT_STATUS_SUCCESS) {
+ error("Could not remove advertisement monitor with status "
+ "0x%02x (%s)", status, mgmt_errstr(status));
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ print("Advertisement monitor with handle: 0x%04x removed",
+ rp->monitor_handle);
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static void cmd_advmon_remove(int argc, char **argv)
+{
+ struct mgmt_cp_remove_adv_monitor cp;
+ uint16_t index, monitor_handle;
+
+ index = mgmt_index;
+ if (index == MGMT_INDEX_NONE)
+ index = 0;
+
+ if (sscanf(argv[1], "%hx", &monitor_handle) != 1) {
+ error("Wrong formatted handle argument");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ cp.monitor_handle = monitor_handle;
+ if (mgmt_send(mgmt, MGMT_OP_REMOVE_ADV_MONITOR, index, sizeof(cp), &cp,
+ advmon_remove_rsp, NULL, NULL) == 0) {
+ error("Unable to send appearance cmd");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+}
+
static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index)
{
mgmt_register(mgmt, MGMT_EV_CONTROLLER_ERROR, index, controller_error,
@@ -4696,6 +4747,8 @@ static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index)
advertising_added, NULL, NULL);
mgmt_register(mgmt, MGMT_EV_ADVERTISING_REMOVED, index,
advertising_removed, NULL, NULL);
+ mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_REMOVED, index, advmon_removed,
+ NULL, NULL);
}

static void cmd_select(int argc, char **argv)
@@ -4719,6 +4772,8 @@ static const struct bt_shell_menu monitor_menu = {
{ "features", NULL,
cmd_advmon_features, "Show advertisement monitor "
"features" },
+ { "remove", "<handle>",
+ cmd_advmon_remove, "Remove advertisement monitor " },
{ } },
};

--
2.27.0.290.gba653c62da-goog

2020-06-17 06:38:05

by bluez.test.bot

Subject: RE: [bluez,v2,2/3] btmgmt: Add command "remove" into "monitor" btmgmt submenu

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While we are preparing for reviewing the patches, we found the following
issue/warning.

Test Result:
checkpatch Failed

Outputs:
WARNING:SSCANF_TO_KSTRTO: Prefer kstrto<type> to single variable sscanf
#72: FILE: tools/btmgmt.c:4685:
+ if (sscanf(argv[1], "%hx", &monitor_handle) != 1) {
+ error("Wrong formatted handle argument");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }

- total: 0 errors, 1 warnings, 79 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.

Your patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPLIT_STRING

NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.



---
Regards,
Linux Bluetooth