Bluetooth: shell: Align with terms in v5.3 spec (1821d342) · Commits · Wenxi XU / zephyr

subsys/bluetooth/shell/bt.c

+19 −19

Original line number	Diff line number	Diff line
		@@ -903,7 +903,7 @@ static int cmd_scan(const struct shell sh, size_t argc, char argv[])
		options \|= BT_LE_SCAN_OPT_FILTER_DUPLICATE;
		} else if (!strcmp(arg, "nodups")) {
		options &= ~BT_LE_SCAN_OPT_FILTER_DUPLICATE;
		} else if (!strcmp(arg, "wl")) {
		} else if (!strcmp(arg, "fal")) {
		options \|= BT_LE_SCAN_OPT_FILTER_ACCEPT_LIST;
		} else if (!strcmp(arg, "coded")) {
		options \|= BT_LE_SCAN_OPT_CODED;
		@@ -987,12 +987,12 @@ static int cmd_advertise(const struct shell sh, size_t argc, char argv[])
		} else if (!strcmp(arg, "non_discov")) {
		ad = NULL;
		ad_len = 0;
		} else if (!strcmp(arg, "wl")) {
		} else if (!strcmp(arg, "fal")) {
		param.options \|= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
		param.options \|= BT_LE_ADV_OPT_FILTER_CONN;
		} else if (!strcmp(arg, "wl-scan")) {
		} else if (!strcmp(arg, "fal-scan")) {
		param.options \|= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
		} else if (!strcmp(arg, "wl-conn")) {
		} else if (!strcmp(arg, "fal-conn")) {
		param.options \|= BT_LE_ADV_OPT_FILTER_CONN;
		} else if (!strcmp(arg, "identity")) {
		param.options \|= BT_LE_ADV_OPT_USE_IDENTITY;
		@@ -1115,12 +1115,12 @@ static bool adv_param_parse(size_t argc, char *argv[],
		param->options \|= BT_LE_ADV_OPT_USE_TX_POWER;
		} else if (!strcmp(arg, "scan-reports")) {
		param->options \|= BT_LE_ADV_OPT_NOTIFY_SCAN_REQ;
		} else if (!strcmp(arg, "wl")) {
		} else if (!strcmp(arg, "fal")) {
		param->options \|= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
		param->options \|= BT_LE_ADV_OPT_FILTER_CONN;
		} else if (!strcmp(arg, "wl-scan")) {
		} else if (!strcmp(arg, "fal-scan")) {
		param->options \|= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
		} else if (!strcmp(arg, "wl-conn")) {
		} else if (!strcmp(arg, "fal-conn")) {
		param->options \|= BT_LE_ADV_OPT_FILTER_CONN;
		} else if (!strcmp(arg, "identity")) {
		param->options \|= BT_LE_ADV_OPT_USE_IDENTITY;
		@@ -2892,7 +2892,7 @@ static int cmd_auth_pairing_confirm(const struct shell *sh,
		}

		#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
		static int cmd_wl_add(const struct shell sh, size_t argc, char argv[])
		static int cmd_fal_add(const struct shell sh, size_t argc, char argv[])
		{
		bt_addr_le_t addr;
		int err;
		@@ -2912,7 +2912,7 @@ static int cmd_wl_add(const struct shell sh, size_t argc, char argv[])
		return 0;
		}

		static int cmd_wl_rem(const struct shell sh, size_t argc, char argv[])
		static int cmd_fal_rem(const struct shell sh, size_t argc, char argv[])
		{
		bt_addr_le_t addr;
		int err;
		@@ -2932,7 +2932,7 @@ static int cmd_wl_rem(const struct shell sh, size_t argc, char argv[])
		return 0;
		}

		static int cmd_wl_clear(const struct shell sh, size_t argc, char argv[])
		static int cmd_fal_clear(const struct shell sh, size_t argc, char argv[])
		{
		int err;

		@@ -2946,7 +2946,7 @@ static int cmd_wl_clear(const struct shell sh, size_t argc, char argv[])
		}

		#if defined(CONFIG_BT_CENTRAL)
		static int cmd_wl_connect(const struct shell sh, size_t argc, char argv[])
		static int cmd_fal_connect(const struct shell sh, size_t argc, char argv[])
		{
		int err;
		const char *action = argv[1];
		@@ -3079,7 +3079,7 @@ static int cmd_auth_oob_tk(const struct shell sh, size_t argc, char argv[])
		#define EXT_ADV_SCAN_OPT " [coded] [no-1m]"
		#define EXT_ADV_PARAM "<type: conn-scan conn-nscan, nconn-scan nconn-nscan> " \
		"[ext-adv] [no-2m] [coded] " \
		"[whitelist: wl, wl-scan, wl-conn] [identity] [name] " \
		"[filter-accept-list: fal, fal-scan, fal-conn] [identity] [name] " \
		"[name-ad] [directed "HELP_ADDR_LE"] [mode: low]" \
		"[disable-37] [disable-38] [disable-39]"
		#else
		@@ -3103,14 +3103,14 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
		SHELL_CMD_ARG(name, NULL, "[name]", cmd_name, 1, 1),
		#if defined(CONFIG_BT_OBSERVER)
		SHELL_CMD_ARG(scan, NULL,
		"<value: on, passive, off> [filter: dups, nodups] [wl]"
		"<value: on, passive, off> [filter: dups, nodups] [fal]"
		EXT_ADV_SCAN_OPT,
		cmd_scan, 2, 4),
		#endif /* CONFIG_BT_OBSERVER */
		#if defined(CONFIG_BT_BROADCASTER)
		SHELL_CMD_ARG(advertise, NULL,
		"<type: off, on, scan, nconn> [mode: discov, non_discov] "
		"[whitelist: wl, wl-scan, wl-conn] [identity] [no-name] "
		"[filter-accept-list: fal, fal-scan, fal-conn] [identity] [no-name] "
		"[one-time] [name-ad]"
		"[disable-37] [disable-38] [disable-39]",
		cmd_advertise, 2, 8),
		@@ -3214,13 +3214,13 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
		cmd_oob_remote, 3, 2),
		SHELL_CMD_ARG(oob-clear, NULL, HELP_NONE, cmd_oob_clear, 1, 0),
		#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
		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, 1, 0),
		SHELL_CMD_ARG(fal-add, NULL, HELP_ADDR_LE, cmd_fal_add, 3, 0),
		SHELL_CMD_ARG(fal-rem, NULL, HELP_ADDR_LE, cmd_fal_rem, 3, 0),
		SHELL_CMD_ARG(fal-clear, NULL, HELP_NONE, cmd_fal_clear, 1, 0),

		#if defined(CONFIG_BT_CENTRAL)
		SHELL_CMD_ARG(wl-connect, NULL, "<on, off>" EXT_ADV_SCAN_OPT,
		cmd_wl_connect, 2, 3),
		SHELL_CMD_ARG(fal-connect, NULL, "<on, off>" EXT_ADV_SCAN_OPT,
		cmd_fal_connect, 2, 3),
		#endif /* CONFIG_BT_CENTRAL */
		#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
		#if defined(CONFIG_BT_FIXED_PASSKEY)

subsys/bluetooth/shell/l2cap.c

+24 −24

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		#define DATA_MTU (23 * CREDITS)

		#define L2CAP_POLICY_NONE 0x00
		#define L2CAP_POLICY_WHITELIST 0x01
		#define L2CAP_POLICY_ALLOWLIST 0x01
		#define L2CAP_POLICY_16BYTE_KEY 0x02

		NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1,
		@@ -43,7 +43,7 @@ NET_BUF_POOL_FIXED_DEFINE(data_tx_pool, 1,
		NET_BUF_POOL_FIXED_DEFINE(data_rx_pool, 1, DATA_MTU, NULL);

		static uint8_t l2cap_policy;
		static struct bt_conn *l2cap_whitelist[CONFIG_BT_MAX_CONN];
		static struct bt_conn *l2cap_allowlist[CONFIG_BT_MAX_CONN];

		static uint32_t l2cap_rate;
		static uint32_t l2cap_recv_delay_ms;
		@@ -172,20 +172,20 @@ static struct l2ch l2ch_chan = {
		.ch.rx.mtu = DATA_MTU,
		};

		static void l2cap_whitelist_remove(struct bt_conn *conn, uint8_t reason)
		static void l2cap_allowlist_remove(struct bt_conn *conn, uint8_t reason)
		{
		int i;

		for (i = 0; i < ARRAY_SIZE(l2cap_whitelist); i++) {
		if (l2cap_whitelist[i] == conn) {
		bt_conn_unref(l2cap_whitelist[i]);
		l2cap_whitelist[i] = NULL;
		for (i = 0; i < ARRAY_SIZE(l2cap_allowlist); i++) {
		if (l2cap_allowlist[i] == conn) {
		bt_conn_unref(l2cap_allowlist[i]);
		l2cap_allowlist[i] = NULL;
		}
		}
		}

		BT_CONN_CB_DEFINE(l2cap_conn_callbacks) = {
		.disconnected = l2cap_whitelist_remove,
		.disconnected = l2cap_allowlist_remove,
		};

		static int l2cap_accept_policy(struct bt_conn *conn)
		@@ -198,9 +198,9 @@ static int l2cap_accept_policy(struct bt_conn *conn)
		if (enc_key_size && enc_key_size < BT_ENC_KEY_SIZE_MAX) {
		return -EPERM;
		}
		} else if (l2cap_policy == L2CAP_POLICY_WHITELIST) {
		for (i = 0; i < ARRAY_SIZE(l2cap_whitelist); i++) {
		if (l2cap_whitelist[i] == conn) {
		} else if (l2cap_policy == L2CAP_POLICY_ALLOWLIST) {
		for (i = 0; i < ARRAY_SIZE(l2cap_allowlist); i++) {
		if (l2cap_allowlist[i] == conn) {
		return 0;
		}
		}
		@@ -254,8 +254,8 @@ static int cmd_register(const struct shell sh, size_t argc, char argv[])
		if (argc > 3) {
		policy = argv[3];

		if (!strcmp(policy, "whitelist")) {
		l2cap_policy = L2CAP_POLICY_WHITELIST;
		if (!strcmp(policy, "allowlist")) {
		l2cap_policy = L2CAP_POLICY_ALLOWLIST;
		} else if (!strcmp(policy, "16byte_key")) {
		l2cap_policy = L2CAP_POLICY_16BYTE_KEY;
		} else {
		@@ -397,7 +397,7 @@ static int cmd_metrics(const struct shell sh, size_t argc, char argv[])
		return 0;
		}

		static int cmd_whitelist_add(const struct shell sh, size_t argc, char argv[])
		static int cmd_allowlist_add(const struct shell sh, size_t argc, char argv[])
		{
		int i;

		@@ -406,9 +406,9 @@ static int cmd_whitelist_add(const struct shell sh, size_t argc, char argv[])
		return 0;
		}

		for (i = 0; i < ARRAY_SIZE(l2cap_whitelist); i++) {
		if (l2cap_whitelist[i] == NULL) {
		l2cap_whitelist[i] = bt_conn_ref(default_conn);
		for (i = 0; i < ARRAY_SIZE(l2cap_allowlist); i++) {
		if (l2cap_allowlist[i] == NULL) {
		l2cap_allowlist[i] = bt_conn_ref(default_conn);
		return 0;
		}
		}
		@@ -416,23 +416,23 @@ static int cmd_whitelist_add(const struct shell sh, size_t argc, char argv[])
		return -ENOMEM;
		}

		static int cmd_whitelist_remove(const struct shell sh, size_t argc, char argv[])
		static int cmd_allowlist_remove(const struct shell sh, size_t argc, char argv[])
		{
		if (!default_conn) {
		shell_error(sh, "Not connected");
		return 0;
		}

		l2cap_whitelist_remove(default_conn, 0);
		l2cap_allowlist_remove(default_conn, 0);

		return 0;
		}

		#define HELP_NONE "[none]"

		SHELL_STATIC_SUBCMD_SET_CREATE(whitelist_cmds,
		SHELL_CMD_ARG(add, NULL, HELP_NONE, cmd_whitelist_add, 1, 0),
		SHELL_CMD_ARG(remove, NULL, HELP_NONE, cmd_whitelist_remove, 1, 0),
		SHELL_STATIC_SUBCMD_SET_CREATE(allowlist_cmds,
		SHELL_CMD_ARG(add, NULL, HELP_NONE, cmd_allowlist_add, 1, 0),
		SHELL_CMD_ARG(remove, NULL, HELP_NONE, cmd_allowlist_remove, 1, 0),
		SHELL_SUBCMD_SET_END
		);

		@@ -442,10 +442,10 @@ SHELL_STATIC_SUBCMD_SET_CREATE(l2cap_cmds,
		SHELL_CMD_ARG(metrics, NULL, "<value on, off>", cmd_metrics, 2, 0),
		SHELL_CMD_ARG(recv, NULL, "[delay (in miliseconds)", cmd_recv, 1, 1),
		SHELL_CMD_ARG(register, NULL, "<psm> [sec_level] "
		"[policy: whitelist, 16byte_key]", cmd_register, 2, 2),
		"[policy: allowlist, 16byte_key]", cmd_register, 2, 2),
		SHELL_CMD_ARG(send, NULL, "[number of packets] [length of packet(s)]",
		cmd_send, 1, 2),
		SHELL_CMD_ARG(whitelist, &whitelist_cmds, HELP_NONE, NULL, 1, 0),
		SHELL_CMD_ARG(allowlist, &allowlist_cmds, HELP_NONE, NULL, 1, 0),
		SHELL_SUBCMD_SET_END
		);

Admin message