michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Shell: Add whitelist commands to shell

Browse source 
Add shell commands to add and remove devices from the shell.
Add commands and options to use whitelist for advertising, scanning,
and creating connections.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-07-22 13:21:49 +02:00 • committed by Carles Cufí
commit 513244afe2
2 changed files with 125 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

155
subsys/bluetooth/shell/bt.c
View file

@ -448,7 +448,7 @@ static int cmd_id_select(const struct shell *shell, size_t argc, char *argv[])
} }
#if defined(CONFIG_BT_OBSERVER) #if defined(CONFIG_BT_OBSERVER)
static int cmd_active_scan_on(const struct shell *shell, int dups) static int cmd_active_scan_on(const struct shell *shell, u8_t filter)
{ {
int err; int err;
struct bt_le_scan_param param = { struct bt_le_scan_param param = {
@ -457,9 +457,7 @@ static int cmd_active_scan_on(const struct shell *shell, int dups)
.interval = BT_GAP_SCAN_FAST_INTERVAL, .interval = BT_GAP_SCAN_FAST_INTERVAL,
.window = BT_GAP_SCAN_FAST_WINDOW }; .window = BT_GAP_SCAN_FAST_WINDOW };
if (dups >= 0) { param.filter_dup = filter;
param.filter_dup = dups;
}
err = bt_le_scan_start(&param, device_found); err = bt_le_scan_start(&param, device_found);
if (err) { if (err) {
@ -473,7 +471,7 @@ static int cmd_active_scan_on(const struct shell *shell, int dups)
return 0; return 0;
} }
static int cmd_passive_scan_on(const struct shell *shell, int dups) static int cmd_passive_scan_on(const struct shell *shell, u8_t filter)
{ {
struct bt_le_scan_param param = { struct bt_le_scan_param param = {
.type = BT_HCI_LE_SCAN_PASSIVE, .type = BT_HCI_LE_SCAN_PASSIVE,
@ -482,9 +480,7 @@ static int cmd_passive_scan_on(const struct shell *shell, int dups)
.window = 0x10 }; .window = 0x10 };
int err; int err;
if (dups >= 0) { param.filter_dup = filter;
param.filter_dup = dups;
}
err = bt_le_scan_start(&param, device_found); err = bt_le_scan_start(&param, device_found);
if (err) { if (err) {
@ -516,16 +512,18 @@ static int cmd_scan_off(const struct shell *shell)
static int cmd_scan(const struct shell *shell, size_t argc, char *argv[]) static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
{ {
const char *action; const char *action;
int dups = -1; u8_t filter = 0;
/* Parse duplicate filtering data */ /* Parse duplicate filtering data */
if (argc >= 3) { for (size_t argn = 2; argn < argc; argn++) {
const char *dup_filter = argv[2]; const char *arg = argv[argn];
if (!strcmp(dup_filter, "dups")) { if (!strcmp(arg, "dups")) {
dups = BT_HCI_LE_SCAN_FILTER_DUP_DISABLE; filter |= BT_LE_SCAN_FILTER_DUPLICATE;
} else if (!strcmp(dup_filter, "nodups")) { } else if (!strcmp(arg, "nodups")) {
dups = BT_HCI_LE_SCAN_FILTER_DUP_ENABLE; filter &= ~BT_LE_SCAN_FILTER_DUPLICATE;
} else if (!strcmp(arg, "wl")) {
filter |= BT_LE_SCAN_FILTER_WHITELIST;
} else { } else {
shell_help(shell); shell_help(shell);
return SHELL_CMD_HELP_PRINTED; return SHELL_CMD_HELP_PRINTED;
@ -534,11 +532,11 @@ static int cmd_scan(const struct shell *shell, size_t argc, char *argv[])
action = argv[1]; action = argv[1];
if (!strcmp(action, "on")) { if (!strcmp(action, "on")) {
return cmd_active_scan_on(shell, dups); return cmd_active_scan_on(shell, filter);
} else if (!strcmp(action, "off")) { } else if (!strcmp(action, "off")) {
return cmd_scan_off(shell); return cmd_scan_off(shell);
} else if (!strcmp(action, "passive")) { } else if (!strcmp(action, "passive")) {
return cmd_passive_scan_on(shell, dups); return cmd_passive_scan_on(shell, filter);
} else { } else {
shell_help(shell); shell_help(shell);
return SHELL_CMD_HELP_PRINTED; return SHELL_CMD_HELP_PRINTED;
@ -586,22 +584,27 @@ static int cmd_advertise(const struct shell *shell, size_t argc, char *argv[])
goto fail; goto fail;
} }
/* Parse advertisement data */ ad = ad_discov;
if (argc >= 3) { ad_len = ARRAY_SIZE(ad_discov);
const char *mode = argv[2];
if (!strcmp(mode, "discov")) { for (size_t argn = 2; argn < argc; argn++) {
ad = ad_discov; const char *arg = argv[argn];
ad_len = ARRAY_SIZE(ad_discov);
} else if (!strcmp(mode, "non_discov")) { if (!strcmp(arg, "discov")) {
/* Default */
} else if (!strcmp(arg, "non_discov")) {
ad = NULL; ad = NULL;
ad_len = 0; ad_len = 0;
} else if (!strcmp(arg, "wl")) {
param.options |= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
param.options |= BT_LE_ADV_OPT_FILTER_CONN;
} else if (!strcmp(arg, "wl-scan")) {
param.options |= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
} else if (!strcmp(arg, "wl-conn")) {
param.options |= BT_LE_ADV_OPT_FILTER_CONN;
} else { } else {
goto fail; goto fail;
} }
} else {
ad = ad_discov;
ad_len = ARRAY_SIZE(ad_discov);
} }
err = bt_le_adv_start(&param, ad, ad_len, NULL, 0); err = bt_le_adv_start(&param, ad, ad_len, NULL, 0);
@ -690,6 +693,7 @@ static int cmd_connect_le(const struct shell *shell, size_t argc, char *argv[])
return 0; return 0;
} }
#if !defined(CONFIG_BT_WHITELIST)
static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[]) static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[])
{ {
bt_addr_le_t addr; bt_addr_le_t addr;
@ -714,6 +718,7 @@ static int cmd_auto_conn(const struct shell *shell, size_t argc, char *argv[])
return 0; return 0;
} }
#endif /* !defined(CONFIG_BT_WHITELIST) */
#endif /* CONFIG_BT_CENTRAL */ #endif /* CONFIG_BT_CENTRAL */
static int cmd_disconnect(const struct shell *shell, size_t argc, char *argv[]) static int cmd_disconnect(const struct shell *shell, size_t argc, char *argv[])
@ -1431,6 +1436,85 @@ static int cmd_auth_pairing_confirm(const struct shell *shell,
return 0; return 0;
} }
#if defined(CONFIG_BT_WHITELIST)
static int cmd_wl_add(const struct shell *shell, size_t argc, char *argv[])
{
bt_addr_le_t addr;
int err;
err = bt_addr_le_from_str(argv[1], argv[2], &addr);
if (err) {
shell_error(shell, "Invalid peer address (err %d)", err);
return err;
}
err = bt_le_whitelist_add(&addr);
if (err) {
shell_error(shell, "Add to whitelist failed (err %d)", err);
return err;
}
return 0;
}
static int cmd_wl_rem(const struct shell *shell, size_t argc, char *argv[])
{
bt_addr_le_t addr;
int err;
err = bt_addr_le_from_str(argv[1], argv[2], &addr);
if (err) {
shell_error(shell, "Invalid peer address (err %d)", err);
return err;
}
err = bt_le_whitelist_rem(&addr);
if (err) {
shell_error(shell, "Remove from whitelist failed (err %d)",
err);
return err;
}
return 0;
}
static int cmd_wl_clear(const struct shell *shell, size_t argc, char *argv[])
{
int err;
err = bt_le_whitelist_clear();
if (err) {
shell_error(shell, "Clearing whitelist failed (err %d)", err);
return err;
}
return 0;
}
static int cmd_wl_connect(const struct shell *shell, size_t argc, char *argv[])
{
int err;
const char *action = argv[1];
if (!strcmp(action, "on")) {
err = bt_conn_create_auto_le(BT_LE_CONN_PARAM_DEFAULT);
if (err) {
shell_error(shell, "Auto connect failed (err %d)", err);
return err;
}
} else if (!strcmp(action, "off")) {
err = bt_conn_create_auto_stop();
if (err) {
shell_error(shell, "Auto connect stop failed (err %d)",
err);
}
return err;
}
return 0;
}
#endif /* defined(CONFIG_BT_WHITELIST) */
#if defined(CONFIG_BT_FIXED_PASSKEY) #if defined(CONFIG_BT_FIXED_PASSKEY)
static int cmd_fixed_passkey(const struct shell *shell, static int cmd_fixed_passkey(const struct shell *shell,
size_t argc, char *argv[]) size_t argc, char *argv[])
@ -1498,13 +1582,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
SHELL_CMD_ARG(name, NULL, "[name]", cmd_name, 1, 1), SHELL_CMD_ARG(name, NULL, "[name]", cmd_name, 1, 1),
#if defined(CONFIG_BT_OBSERVER) #if defined(CONFIG_BT_OBSERVER)
SHELL_CMD_ARG(scan, NULL, SHELL_CMD_ARG(scan, NULL,
"<value: on, passive, off> <dup filter: dups, nodups>", "<value: on, passive, off> [filter: dups, nodups] [wl]",
cmd_scan, 2, 1), cmd_scan, 2, 2),
#endif /* CONFIG_BT_OBSERVER */ #endif /* CONFIG_BT_OBSERVER */
#if defined(CONFIG_BT_BROADCASTER) #if defined(CONFIG_BT_BROADCASTER)
SHELL_CMD_ARG(advertise, NULL, SHELL_CMD_ARG(advertise, NULL,
"<type: off, on, scan, nconn> <mode: discov, non_discov>", "<type: off, on, scan, nconn> [mode: discov, non_discov] "
cmd_advertise, 2, 1), "[whitelist: wl, wl-scan, wl-conn]",
cmd_advertise, 2, 2),
#if defined(CONFIG_BT_PERIPHERAL) #if defined(CONFIG_BT_PERIPHERAL)
SHELL_CMD_ARG(directed-adv, NULL, HELP_ADDR_LE " [mode: low]", SHELL_CMD_ARG(directed-adv, NULL, HELP_ADDR_LE " [mode: low]",
cmd_directed_adv, 3, 1), cmd_directed_adv, 3, 1),
@ -1513,7 +1598,9 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
#if defined(CONFIG_BT_CONN) #if defined(CONFIG_BT_CONN)
#if defined(CONFIG_BT_CENTRAL) #if defined(CONFIG_BT_CENTRAL)
SHELL_CMD_ARG(connect, NULL, HELP_ADDR_LE, cmd_connect_le, 3, 0), SHELL_CMD_ARG(connect, NULL, HELP_ADDR_LE, cmd_connect_le, 3, 0),
#if !defined(CONFIG_BT_WHITELIST)
SHELL_CMD_ARG(auto-conn, NULL, HELP_ADDR_LE, cmd_auto_conn, 3, 0), SHELL_CMD_ARG(auto-conn, NULL, HELP_ADDR_LE, cmd_auto_conn, 3, 0),
#endif /* !defined(CONFIG_BT_WHITELIST) */
#endif /* CONFIG_BT_CENTRAL */ #endif /* CONFIG_BT_CENTRAL */
SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_disconnect, 1, 2), SHELL_CMD_ARG(disconnect, NULL, HELP_NONE, cmd_disconnect, 1, 2),
SHELL_CMD_ARG(select, NULL, HELP_ADDR_LE, cmd_select, 3, 0), SHELL_CMD_ARG(select, NULL, HELP_ADDR_LE, cmd_select, 3, 0),
@ -1546,6 +1633,12 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
HELP_ADDR_LE" <oob rand> <oob confirm>", HELP_ADDR_LE" <oob rand> <oob confirm>",
cmd_oob_remote, 3, 2), cmd_oob_remote, 3, 2),
SHELL_CMD_ARG(oob-clear, NULL, HELP_NONE, cmd_oob_clear, 1, 0), SHELL_CMD_ARG(oob-clear, NULL, HELP_NONE, cmd_oob_clear, 1, 0),
#if defined(CONFIG_BT_WHITELIST)
SHELL_CMD_ARG(wl-add, NULL, HELP_ADDR_LE, cmd_wl_add, 3, 0),
SHELL_CMD_ARG(wl-rem, NULL, HELP_ADDR_LE, cmd_wl_rem, 3, 0),
SHELL_CMD_ARG(wl-clear, NULL, HELP_NONE, cmd_wl_clear, 2, 0),
SHELL_CMD_ARG(wl-connect, NULL, "<on, off>", cmd_wl_connect, 2, 0),
#endif /* defined(CONFIG_BT_WHITELIST) */
#if defined(CONFIG_BT_FIXED_PASSKEY) #if defined(CONFIG_BT_FIXED_PASSKEY)
SHELL_CMD_ARG(fixed-passkey, NULL, "[passkey]", cmd_fixed_passkey, SHELL_CMD_ARG(fixed-passkey, NULL, "[passkey]", cmd_fixed_passkey,
1, 1), 1, 1),

1
tests/bluetooth/shell/prj.conf
View file

@ -22,6 +22,7 @@ CONFIG_BT_L2CAP_TX_BUF_COUNT=4
CONFIG_BT_ID_MAX=2 CONFIG_BT_ID_MAX=2
CONFIG_BT_GATT_DYNAMIC_DB=y CONFIG_BT_GATT_DYNAMIC_DB=y
CONFIG_BT_GATT_HRS=y CONFIG_BT_GATT_HRS=y
CONFIG_BT_WHITELIST=y
CONFIG_BT_SETTINGS=y CONFIG_BT_SETTINGS=y
CONFIG_FLASH=y CONFIG_FLASH=y