korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-24 04:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

btmgmt: Add command "remove" into "monitor" btmgmt submenu

Browse Source 
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.

Tested on Atlas Chromebook with a sample stdout below:
[mgmt]# remove 1
Advertisement monitor with handle: 0x0001 removed
[mgmt]# remove 1234
Could not remove advertisement monitor with status 0x11 (Invalid Index)
This commit is contained in:
Michael Sun 2020-06-19 15:56:22 -07:00 committed by Luiz Augusto von Dentz
parent 3f96e817fe
commit fbc85a5003
1 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tools/btmgmt.c
View File

@ -1013,6 +1013,20 @@ 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__,
le16_to_cpu(ev->monitor_handle));
}
static void version_rsp(uint8_t status, uint16_t len, const void *param,
void *user_data)
{
@ -4644,6 +4658,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",
le16_to_cpu(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 = cpu_to_le16(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 +4748,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 +4773,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 " },
{ } },
};