michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: shell: allow multiple parameters for bt hci-cmd

Browse source 
The hci-cmd currently accepts only a 1 byte parameter. This
disables use of commands that requires more than 1 byte,
for ex. the feature exchange that requires a 16 bit parameter.

This commit allows a datafield parameter up to 65 bytes long.
65 bytes comes from the nr. of parameters for the
HCI_LE_Generate_DHKey command

Signed-off-by: Andries Kruithof <Andries.Kruithof@nordicsemi.no>
This commit is contained in:
Andries Kruithof 2020-05-20 16:40:57 +02:00 • committed by Johan Hedberg
commit 2bfb128463
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,6 +56,12 @@ static struct bt_le_oob oob_remote;
#define KEY_STR_LEN 33 #define KEY_STR_LEN 33
/*
* Based on the maximum number of parameters for HCI_LE_Generate_DHKey
* See BT Core Spec V5.2 Vol. 4, Part E, section 7.8.37
*/
#define HCI_CMD_MAX_PARAM 65
#if defined(CONFIG_BT_EXT_ADV) #if defined(CONFIG_BT_EXT_ADV)
static uint8_t selected_adv; static uint8_t selected_adv;
struct bt_le_ext_adv *adv_sets[CONFIG_BT_EXT_ADV_MAX_ADV_SET]; struct bt_le_ext_adv *adv_sets[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
@ -455,18 +461,30 @@ static int cmd_hci_cmd(const struct shell *shell, size_t argc, char *argv[])
uint16_t ocf; uint16_t ocf;
struct net_buf *buf = NULL, *rsp; struct net_buf *buf = NULL, *rsp;
int err; int err;
static uint8_t hex_data[HCI_CMD_MAX_PARAM];
int hex_data_len;
hex_data_len = 0;
ogf = strtoul(argv[1], NULL, 16); ogf = strtoul(argv[1], NULL, 16);
ocf = strtoul(argv[2], NULL, 16); ocf = strtoul(argv[2], NULL, 16);
if (argc > 3) { if (argc > 3) {
size_t i; size_t len;
buf = bt_hci_cmd_create(BT_OP(ogf, ocf), argc - 3); if (strlen(argv[3]) > 2 * HCI_CMD_MAX_PARAM) {
shell_error(shell, "Data field too large\n");
for (i = 3; i < argc; i++) { return -ENOEXEC;
net_buf_add_u8(buf, strtoul(argv[i], NULL, 16));
} }
len = hex2bin(argv[3], strlen(argv[3]), &hex_data[hex_data_len],
sizeof(hex_data) - hex_data_len);
if (!len) {
shell_error(shell, "HCI command illegal data field\n");
return -ENOEXEC;
}
buf = bt_hci_cmd_create(BT_OP(ogf, ocf), len);
net_buf_add_mem(buf, hex_data, len);
} }
err = bt_hci_cmd_send_sync(BT_OP(ogf, ocf), buf, &rsp); err = bt_hci_cmd_send_sync(BT_OP(ogf, ocf), buf, &rsp);