mirror of
https://github.com/espressif/esp-nimble.git
synced 2026-07-29 06:07:56 +00:00
nimble/ll: Fix handling of unknown commands
For commands not supported by controller we should not validate length but just reply with Unknown HCI Command error.
This commit is contained in:
@@ -701,7 +701,6 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
|
||||
ble_ll_hci_post_cmd_complete_cb *cb)
|
||||
{
|
||||
int rc;
|
||||
uint8_t cmdlen;
|
||||
uint8_t len;
|
||||
uint8_t *rspbuf;
|
||||
|
||||
@@ -711,12 +710,6 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
|
||||
/* Get length from command */
|
||||
len = cmdbuf[sizeof(uint16_t)];
|
||||
|
||||
/* Check the length to make sure it is valid */
|
||||
cmdlen = g_ble_hci_le_cmd_len[ocf];
|
||||
if (len != cmdlen && cmdlen != BLE_HCI_VARIABLE_LEN) {
|
||||
goto ll_hci_le_cmd_exit;
|
||||
}
|
||||
|
||||
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
|
||||
if (!ble_ll_is_valid_adv_mode(ocf)) {
|
||||
rc = BLE_ERR_CMD_DISALLOWED;
|
||||
@@ -736,211 +729,331 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
|
||||
|
||||
switch (ocf) {
|
||||
case BLE_HCI_OCF_LE_SET_EVENT_MASK:
|
||||
rc = ble_ll_hci_set_le_event_mask(cmdbuf);
|
||||
if (len == BLE_HCI_SET_LE_EVENT_MASK_LEN) {
|
||||
rc = ble_ll_hci_set_le_event_mask(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_BUF_SIZE:
|
||||
rc = ble_ll_hci_le_read_bufsize(rspbuf, rsplen);
|
||||
if (len == BLE_HCI_RD_BUF_SIZE_LEN) {
|
||||
rc = ble_ll_hci_le_read_bufsize(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_LOC_SUPP_FEAT:
|
||||
rc = ble_ll_hci_le_read_local_features(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_hci_le_read_local_features(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_RAND_ADDR:
|
||||
if (len == BLE_HCI_SET_RAND_ADDR_LEN) {
|
||||
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
|
||||
rc = ble_ll_set_random_addr(cmdbuf, hci_adv_mode == ADV_MODE_EXT);
|
||||
rc = ble_ll_set_random_addr(cmdbuf, hci_adv_mode == ADV_MODE_EXT);
|
||||
#else
|
||||
rc = ble_ll_set_random_addr(cmdbuf, false);
|
||||
rc = ble_ll_set_random_addr(cmdbuf, false);
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_ADV_PARAMS:
|
||||
rc = ble_ll_adv_set_adv_params(cmdbuf);
|
||||
if (len == BLE_HCI_SET_ADV_PARAM_LEN) {
|
||||
rc = ble_ll_adv_set_adv_params(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_ADV_CHAN_TXPWR:
|
||||
rc = ble_ll_adv_read_txpwr(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_adv_read_txpwr(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_ADV_DATA:
|
||||
rc = ble_ll_adv_set_adv_data(cmdbuf, 0,
|
||||
if (len == BLE_HCI_SET_ADV_DATA_LEN) {
|
||||
rc = ble_ll_adv_set_adv_data(cmdbuf, 0,
|
||||
BLE_HCI_LE_SET_EXT_ADV_DATA_OPER_COMPLETE);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_SCAN_RSP_DATA:
|
||||
rc = ble_ll_adv_set_scan_rsp_data(cmdbuf, 0,
|
||||
if (len == BLE_HCI_SET_SCAN_RSP_DATA_LEN) {
|
||||
rc = ble_ll_adv_set_scan_rsp_data(cmdbuf, 0,
|
||||
BLE_HCI_LE_SET_EXT_SCAN_RSP_DATA_OPER_COMPLETE);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_ADV_ENABLE:
|
||||
rc = ble_ll_adv_set_enable(0, cmdbuf[0], -1, 0);
|
||||
if (len == BLE_HCI_SET_ADV_ENABLE_LEN) {
|
||||
rc = ble_ll_adv_set_enable(0, cmdbuf[0], -1, 0);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_SCAN_ENABLE:
|
||||
rc = ble_ll_scan_set_enable(cmdbuf, 0);
|
||||
if (len == BLE_HCI_SET_SCAN_ENABLE_LEN) {
|
||||
rc = ble_ll_scan_set_enable(cmdbuf, 0);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_SCAN_PARAMS:
|
||||
rc = ble_ll_scan_set_scan_params(cmdbuf);
|
||||
if (len == BLE_HCI_SET_SCAN_PARAM_LEN) {
|
||||
rc = ble_ll_scan_set_scan_params(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CREATE_CONN:
|
||||
rc = ble_ll_conn_create(cmdbuf);
|
||||
if (len == BLE_HCI_CREATE_CONN_LEN) {
|
||||
rc = ble_ll_conn_create(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CREATE_CONN_CANCEL:
|
||||
rc = ble_ll_conn_create_cancel(cb);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_conn_create_cancel(cb);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CLEAR_WHITE_LIST:
|
||||
rc = ble_ll_whitelist_clear();
|
||||
if (len == 0) {
|
||||
rc = ble_ll_whitelist_clear();
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_WHITE_LIST_SIZE:
|
||||
rc = ble_ll_whitelist_read_size(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_whitelist_read_size(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_ADD_WHITE_LIST:
|
||||
rc = ble_ll_whitelist_add(cmdbuf + 1, cmdbuf[0]);
|
||||
if (len == BLE_HCI_ADD_WHITE_LIST_LEN) {
|
||||
rc = ble_ll_whitelist_add(cmdbuf + 1, cmdbuf[0]);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RMV_WHITE_LIST:
|
||||
rc = ble_ll_whitelist_rmv(cmdbuf + 1, cmdbuf[0]);
|
||||
if (len == BLE_HCI_RMV_WHITE_LIST_LEN) {
|
||||
rc = ble_ll_whitelist_rmv(cmdbuf + 1, cmdbuf[0]);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CONN_UPDATE:
|
||||
rc = ble_ll_conn_hci_update(cmdbuf);
|
||||
if (len == BLE_HCI_CONN_UPDATE_LEN) {
|
||||
rc = ble_ll_conn_hci_update(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_HOST_CHAN_CLASS:
|
||||
rc = ble_ll_conn_hci_set_chan_class(cmdbuf);
|
||||
if (BLE_HCI_SET_HOST_CHAN_CLASS_LEN) {
|
||||
rc = ble_ll_conn_hci_set_chan_class(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_CHAN_MAP:
|
||||
rc = ble_ll_conn_hci_rd_chan_map(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_RD_CHANMAP_LEN) {
|
||||
rc = ble_ll_conn_hci_rd_chan_map(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_REM_FEAT:
|
||||
rc = ble_ll_conn_hci_read_rem_features(cmdbuf);
|
||||
if (len == BLE_HCI_CONN_RD_REM_FEAT_LEN) {
|
||||
rc = ble_ll_conn_hci_read_rem_features(cmdbuf);
|
||||
}
|
||||
break;
|
||||
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
|
||||
case BLE_HCI_OCF_LE_ENCRYPT:
|
||||
rc = ble_ll_hci_le_encrypt(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_LE_ENCRYPT_LEN) {
|
||||
rc = ble_ll_hci_le_encrypt(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case BLE_HCI_OCF_LE_RAND:
|
||||
rc = ble_ll_hci_le_rand(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_hci_le_rand(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) == 1)
|
||||
case BLE_HCI_OCF_LE_START_ENCRYPT:
|
||||
rc = ble_ll_conn_hci_le_start_encrypt(cmdbuf);
|
||||
if (len == BLE_HCI_LE_START_ENCRYPT_LEN) {
|
||||
rc = ble_ll_conn_hci_le_start_encrypt(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_LT_KEY_REQ_REPLY:
|
||||
rc = ble_ll_conn_hci_le_ltk_reply(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_LT_KEY_REQ_REPLY_LEN) {
|
||||
rc = ble_ll_conn_hci_le_ltk_reply(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_LT_KEY_REQ_NEG_REPLY:
|
||||
rc = ble_ll_conn_hci_le_ltk_neg_reply(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_LT_KEY_REQ_NEG_REPLY_LEN) {
|
||||
rc = ble_ll_conn_hci_le_ltk_neg_reply(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
case BLE_HCI_OCF_LE_RD_SUPP_STATES :
|
||||
rc = ble_ll_hci_le_read_supp_states(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_hci_le_read_supp_states(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_REM_CONN_PARAM_NRR:
|
||||
rc = ble_ll_conn_hci_param_reply(cmdbuf, 0, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_CONN_PARAM_NEG_REPLY_LEN) {
|
||||
rc = ble_ll_conn_hci_param_reply(cmdbuf, 0, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_REM_CONN_PARAM_RR:
|
||||
rc = ble_ll_conn_hci_param_reply(cmdbuf, 1, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_CONN_PARAM_REPLY_LEN) {
|
||||
rc = ble_ll_conn_hci_param_reply(cmdbuf, 1, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT) == 1)
|
||||
case BLE_HCI_OCF_LE_SET_DATA_LEN:
|
||||
rc = ble_ll_conn_hci_set_data_len(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_SET_DATALEN_LEN) {
|
||||
rc = ble_ll_conn_hci_set_data_len(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_SUGG_DEF_DATA_LEN:
|
||||
rc = ble_ll_hci_le_rd_sugg_data_len(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_hci_le_rd_sugg_data_len(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_WR_SUGG_DEF_DATA_LEN:
|
||||
rc = ble_ll_hci_le_wr_sugg_data_len(cmdbuf);
|
||||
if (len == BLE_HCI_WR_SUGG_DATALEN_LEN) {
|
||||
rc = ble_ll_hci_le_wr_sugg_data_len(cmdbuf);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) == 1)
|
||||
case BLE_HCI_OCF_LE_ADD_RESOLV_LIST :
|
||||
rc = ble_ll_resolv_list_add(cmdbuf);
|
||||
if (len == BLE_HCI_ADD_TO_RESOLV_LIST_LEN) {
|
||||
rc = ble_ll_resolv_list_add(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RMV_RESOLV_LIST:
|
||||
rc = ble_ll_resolv_list_rmv(cmdbuf);
|
||||
if (len == BLE_HCI_RMV_FROM_RESOLV_LIST_LEN) {
|
||||
rc = ble_ll_resolv_list_rmv(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CLR_RESOLV_LIST:
|
||||
rc = ble_ll_resolv_list_clr();
|
||||
if (len == 0) {
|
||||
rc = ble_ll_resolv_list_clr();
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_RESOLV_LIST_SIZE:
|
||||
rc = ble_ll_resolv_list_read_size(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_resolv_list_read_size(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_PEER_RESOLV_ADDR:
|
||||
rc = ble_ll_resolv_peer_addr_rd(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_RD_PEER_RESOLV_ADDR_LEN) {
|
||||
rc = ble_ll_resolv_peer_addr_rd(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_LOCAL_RESOLV_ADDR:
|
||||
rc = ble_ll_resolv_local_addr_rd(cmdbuf, rspbuf, rsplen);
|
||||
if(len == BLE_HCI_RD_LOC_RESOLV_ADDR_LEN) {
|
||||
rc = ble_ll_resolv_local_addr_rd(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_ADDR_RES_EN:
|
||||
rc = ble_ll_resolv_enable_cmd(cmdbuf);
|
||||
if (len == BLE_HCI_SET_ADDR_RESOL_ENA_LEN) {
|
||||
rc = ble_ll_resolv_enable_cmd(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_RPA_TMO:
|
||||
rc = ble_ll_resolv_set_rpa_tmo(cmdbuf);
|
||||
if (len == BLE_HCI_SET_RESOLV_PRIV_ADDR_TO_LEN) {
|
||||
rc = ble_ll_resolv_set_rpa_tmo(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_PRIVACY_MODE:
|
||||
rc = ble_ll_resolve_set_priv_mode(cmdbuf);
|
||||
if (len == BLE_HCI_LE_SET_PRIVACY_MODE_LEN) {
|
||||
rc = ble_ll_resolve_set_priv_mode(cmdbuf);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
|
||||
case BLE_HCI_OCF_LE_SET_EXT_SCAN_PARAM:
|
||||
rc = ble_ll_set_ext_scan_params(cmdbuf);
|
||||
if (len == BLE_HCI_LE_SET_EXT_SCAN_PARAM_LEN) {
|
||||
rc = ble_ll_set_ext_scan_params(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_EXT_SCAN_ENABLE:
|
||||
rc = ble_ll_scan_set_enable(cmdbuf, 1);
|
||||
if (len == BLE_HCI_LE_SET_EXT_SCAN_ENABLE_LEN) {
|
||||
rc = ble_ll_scan_set_enable(cmdbuf, 1);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_EXT_CREATE_CONN:
|
||||
/* variable length */
|
||||
rc = ble_ll_ext_conn_create(cmdbuf);
|
||||
break;
|
||||
#endif
|
||||
case BLE_HCI_OCF_LE_RD_MAX_DATA_LEN:
|
||||
rc = ble_ll_hci_le_rd_max_data_len(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_hci_le_rd_max_data_len(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV) == 1)
|
||||
case BLE_HCI_OCF_LE_SET_ADV_SET_RND_ADDR:
|
||||
rc = ble_ll_adv_set_random_addr(cmdbuf + 1, cmdbuf[0]);
|
||||
if (len == BLE_HCI_LE_SET_ADV_SET_RND_ADDR_LEN) {
|
||||
rc = ble_ll_adv_set_random_addr(cmdbuf + 1, cmdbuf[0]);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM:
|
||||
rc = ble_ll_adv_ext_set_param(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_LE_SET_EXT_ADV_PARAM_LEN) {
|
||||
rc = ble_ll_adv_ext_set_param(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_EXT_ADV_DATA:
|
||||
rc = ble_ll_adv_ext_set_adv_data(cmdbuf, cmdlen);
|
||||
/* variable length */
|
||||
rc = ble_ll_adv_ext_set_adv_data(cmdbuf, len);
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_EXT_SCAN_RSP_DATA:
|
||||
rc = ble_ll_adv_ext_set_scan_rsp(cmdbuf, cmdlen);
|
||||
/* variable length */
|
||||
rc = ble_ll_adv_ext_set_scan_rsp(cmdbuf, len);
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_EXT_ADV_ENABLE:
|
||||
/* variable length */
|
||||
rc = ble_ll_adv_ext_set_enable(cmdbuf, len);
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_MAX_ADV_DATA_LEN:
|
||||
rc = ble_ll_adv_rd_max_adv_data_len(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_adv_rd_max_adv_data_len(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RD_NUM_OF_ADV_SETS:
|
||||
rc = ble_ll_adv_rd_sup_adv_sets(rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_adv_rd_sup_adv_sets(rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_REMOVE_ADV_SET:
|
||||
rc = ble_ll_ext_adv_set_remove(cmdbuf);
|
||||
if (len == BLE_HCI_LE_REMOVE_ADV_SET_LEN) {
|
||||
rc = ble_ll_ext_adv_set_remove(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_CLEAR_ADV_SETS:
|
||||
rc = ble_ll_adv_clear_all();
|
||||
if (len == 0) {
|
||||
rc = ble_ll_adv_clear_all();
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
|
||||
case BLE_HCI_OCF_LE_RD_PHY:
|
||||
rc = ble_ll_conn_hci_le_rd_phy(cmdbuf, rspbuf, rsplen);
|
||||
if (len == BLE_HCI_LE_RD_PHY_LEN) {
|
||||
rc = ble_ll_conn_hci_le_rd_phy(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_DEFAULT_PHY:
|
||||
rc = ble_ll_hci_le_set_def_phy(cmdbuf);
|
||||
if (len == BLE_HCI_LE_SET_DEFAULT_PHY_LEN) {
|
||||
rc = ble_ll_hci_le_set_def_phy(cmdbuf);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_SET_PHY:
|
||||
rc = ble_ll_conn_hci_le_set_phy(cmdbuf);
|
||||
if (len == BLE_HCI_LE_SET_PHY_LEN) {
|
||||
rc = ble_ll_conn_hci_le_set_phy(cmdbuf);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) == 1
|
||||
case BLE_HCI_OCF_LE_TX_TEST:
|
||||
rc = ble_ll_dtm_tx_test(cmdbuf, false);
|
||||
if (len == BLE_HCI_TX_TEST_LEN) {
|
||||
rc = ble_ll_dtm_tx_test(cmdbuf, false);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_RX_TEST:
|
||||
rc = ble_ll_dtm_rx_test(cmdbuf, false);
|
||||
if (len == BLE_HCI_RX_TEST_LEN) {
|
||||
rc = ble_ll_dtm_rx_test(cmdbuf, false);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_TEST_END:
|
||||
rc = ble_ll_dtm_end_test(cmdbuf, rspbuf, rsplen);
|
||||
if (len == 0) {
|
||||
rc = ble_ll_dtm_end_test(cmdbuf, rspbuf, rsplen);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_ENH_RX_TEST:
|
||||
rc = ble_ll_dtm_rx_test(cmdbuf, true);
|
||||
if (len == BLE_HCI_LE_ENH_RX_TEST_LEN) {
|
||||
rc = ble_ll_dtm_rx_test(cmdbuf, true);
|
||||
}
|
||||
break;
|
||||
case BLE_HCI_OCF_LE_ENH_TX_TEST:
|
||||
rc = ble_ll_dtm_tx_test(cmdbuf, true);
|
||||
if (len == BLE_HCI_LE_ENH_TX_TEST_LEN) {
|
||||
rc = ble_ll_dtm_tx_test(cmdbuf, true);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
@@ -948,12 +1061,14 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen,
|
||||
break;
|
||||
}
|
||||
|
||||
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
|
||||
ll_hci_le_cmd_exit:
|
||||
#endif
|
||||
/*
|
||||
* This code is here because we add 256 to the return code to denote
|
||||
* that the reply to this command should be command status (as opposed to
|
||||
* command complete).
|
||||
*/
|
||||
ll_hci_le_cmd_exit:
|
||||
if (ble_ll_hci_le_cmd_send_cmd_status(ocf)) {
|
||||
rc += (BLE_ERR_MAX + 1);
|
||||
}
|
||||
|
||||
@@ -1685,7 +1685,7 @@ ble_gap_wl_busy(void)
|
||||
static int
|
||||
ble_gap_wl_tx_add(const ble_addr_t *addr)
|
||||
{
|
||||
uint8_t buf[BLE_HCI_CHG_WHITE_LIST_LEN];
|
||||
uint8_t buf[BLE_HCI_ADD_WHITE_LIST_LEN];
|
||||
int rc;
|
||||
|
||||
rc = ble_hs_hci_cmd_build_le_add_to_whitelist(addr->val, addr->type,
|
||||
|
||||
@@ -521,7 +521,7 @@ ble_hs_hci_cmd_build_le_add_to_whitelist(const uint8_t *addr,
|
||||
uint8_t addr_type,
|
||||
uint8_t *dst, int dst_len)
|
||||
{
|
||||
BLE_HS_DBG_ASSERT(dst_len >= BLE_HCI_CHG_WHITE_LIST_LEN);
|
||||
BLE_HS_DBG_ASSERT(dst_len >= BLE_HCI_ADD_WHITE_LIST_LEN);
|
||||
|
||||
return ble_hs_hci_cmd_body_le_whitelist_chg(addr, addr_type, dst);
|
||||
}
|
||||
|
||||
@@ -353,7 +353,8 @@ extern "C" {
|
||||
#define BLE_HCI_SCAN_FILT_MAX (3)
|
||||
|
||||
/* Whitelist commands */
|
||||
#define BLE_HCI_CHG_WHITE_LIST_LEN (7)
|
||||
#define BLE_HCI_ADD_WHITE_LIST_LEN (7)
|
||||
#define BLE_HCI_RMV_WHITE_LIST_LEN (7)
|
||||
|
||||
/* Create Connection */
|
||||
#define BLE_HCI_CREATE_CONN_LEN (25)
|
||||
@@ -410,6 +411,9 @@ extern "C" {
|
||||
/* --- LE read supported states (OCF 0x001C) --- */
|
||||
#define BLE_HCI_RD_SUPP_STATES_RSPLEN (8)
|
||||
|
||||
/* --- LE receiver test command (OCF 0x001D) --- */
|
||||
#define BLE_HCI_RX_TEST_LEN (1)
|
||||
|
||||
/* --- LE transitter test command (OCF 0x001E) --- */
|
||||
#define BLE_HCI_TX_TEST_LEN (3)
|
||||
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
#include <stdint.h>
|
||||
#include "os/os.h"
|
||||
#include "nimble/ble.h"
|
||||
#include "nimble/hci_common.h"
|
||||
|
||||
/*
|
||||
* Storage for the length of each HCI LE command. This is the length of the
|
||||
* command parameters in the command; not the response length.
|
||||
*/
|
||||
const uint8_t g_ble_hci_le_cmd_len[BLE_HCI_NUM_LE_CMDS] =
|
||||
{
|
||||
0, /* 0x0000: reserved */
|
||||
BLE_HCI_SET_LE_EVENT_MASK_LEN, /* 0x0001: set event mask */
|
||||
BLE_HCI_RD_BUF_SIZE_LEN, /* 0x0002: read buffer size */
|
||||
0, /* 0x0003: read local supp features */
|
||||
0, /* 0x0004: not defined */
|
||||
BLE_HCI_SET_RAND_ADDR_LEN, /* 0x0005: set random address */
|
||||
BLE_HCI_SET_ADV_PARAM_LEN, /* 0x0006: set advertising parameters */
|
||||
0, /* 0x0007: read adv chan tx power */
|
||||
BLE_HCI_SET_ADV_DATA_LEN, /* 0x0008: set advertising data */
|
||||
BLE_HCI_SET_SCAN_RSP_DATA_LEN, /* 0x0009: set scan rsp data */
|
||||
BLE_HCI_SET_ADV_ENABLE_LEN, /* 0x000A: set advertising enable */
|
||||
BLE_HCI_SET_SCAN_PARAM_LEN, /* 0x000B: set scan parameters */
|
||||
BLE_HCI_SET_SCAN_ENABLE_LEN, /* 0x000C: set scan enable */
|
||||
BLE_HCI_CREATE_CONN_LEN, /* 0x000D: create connection */
|
||||
0, /* 0x000E: create connection cancel*/
|
||||
0, /* 0x000F: read whitelist size */
|
||||
0, /* 0x0010: clear white list */
|
||||
BLE_HCI_CHG_WHITE_LIST_LEN, /* 0x0011: add to white list */
|
||||
BLE_HCI_CHG_WHITE_LIST_LEN, /* 0x0012: remove from white list */
|
||||
BLE_HCI_CONN_UPDATE_LEN, /* 0x0013: connection update */
|
||||
BLE_HCI_SET_HOST_CHAN_CLASS_LEN, /* 0x0014: set host chan class */
|
||||
sizeof(uint16_t), /* 0x0015: read channel map */
|
||||
BLE_HCI_CONN_RD_REM_FEAT_LEN, /* 0x0016: read remote features */
|
||||
BLE_HCI_LE_ENCRYPT_LEN, /* 0x0017: encrypt */
|
||||
0, /* 0x0018: rand */
|
||||
BLE_HCI_LE_START_ENCRYPT_LEN, /* 0x0019: start encryption */
|
||||
BLE_HCI_LT_KEY_REQ_REPLY_LEN, /* 0x001A: LTK request reply */
|
||||
sizeof(uint16_t), /* 0x001B: LTK request negative reply */
|
||||
0, /* 0x001C: read supported states */
|
||||
sizeof(uint8_t), /* 0x001D: receiver test */
|
||||
BLE_HCI_TX_TEST_LEN, /* 0x001E: transmitter test */
|
||||
0, /* 0x001F: test end */
|
||||
BLE_HCI_CONN_PARAM_REPLY_LEN, /* 0x0020: conn param reply */
|
||||
BLE_HCI_CONN_PARAM_NEG_REPLY_LEN, /* 0x0021: conn param neg reply */
|
||||
BLE_HCI_SET_DATALEN_LEN, /* 0x0022: set data length */
|
||||
0, /* 0x0023: read sugg data len */
|
||||
BLE_HCI_WR_SUGG_DATALEN_LEN, /* 0x0024: write suggested data len */
|
||||
0, /* 0x0025: rd local P256 pub key */
|
||||
BLE_HCI_GEN_DHKEY_LEN, /* 0x0026: generate DHKEY */
|
||||
BLE_HCI_ADD_TO_RESOLV_LIST_LEN, /* 0x0027: add to resolving list */
|
||||
BLE_HCI_RMV_FROM_RESOLV_LIST_LEN, /* 0x0028: rmv from resolving list */
|
||||
0, /* 0x0029: clear resolving list */
|
||||
0, /* 0x002A: read resolving list size */
|
||||
BLE_HCI_RD_PEER_RESOLV_ADDR_LEN, /* 0x002B: read peer resolvable addr */
|
||||
BLE_HCI_RD_LOC_RESOLV_ADDR_LEN, /* 0x002C: read local resolvable addr */
|
||||
sizeof(uint8_t), /* 0x002D: set addr resolution enable */
|
||||
sizeof(uint16_t), /* 0x002E: set resolv priv addr tmo */
|
||||
0, /* 0x002F: read max data length */
|
||||
BLE_HCI_LE_RD_PHY_LEN, /* 0x0030: read maximum default PHY */
|
||||
BLE_HCI_LE_SET_DEFAULT_PHY_LEN, /* 0x0031: set default PHY */
|
||||
BLE_HCI_LE_SET_PHY_LEN, /* 0x0032: set PHY */
|
||||
BLE_HCI_LE_ENH_RX_TEST_LEN, /* 0x0033: enhanced receiver test */
|
||||
BLE_HCI_LE_ENH_TX_TEST_LEN, /* 0x0034: enhanced transmitter test */
|
||||
BLE_HCI_LE_SET_ADV_SET_RND_ADDR_LEN,/* 0x0035: set adv. set random address */
|
||||
BLE_HCI_LE_SET_EXT_ADV_PARAM_LEN, /* 0x0036: set ext. adv params */
|
||||
BLE_HCI_LE_SET_EXT_ADV_DATA_LEN, /* 0x0037: set ext. adv. data */
|
||||
BLE_HCI_LE_SET_EXT_SCAN_RSP_DATA_LEN,/* 0x0038: set ext. scan resp. data */
|
||||
BLE_HCI_LE_SET_EXT_ADV_ENABLE_LEN, /* 0x0039: set ext. adv. enable */
|
||||
0, /* 0x003A: read max adv. data len */
|
||||
0, /* 0x003B: read number of sup. adv. sets */
|
||||
BLE_HCI_LE_REMOVE_ADV_SET_LEN, /* 0x003C: remove adv. set */
|
||||
0, /* 0x003D: clear advertising sets */
|
||||
BLE_HCI_LE_SET_PER_ADV_PARAMS_LEN, /* 0x003E: set periodic adv. param. */
|
||||
BLE_HCI_LE_SET_PER_ADV_DATA_LEN, /* 0x003F: set periodic adv. data */
|
||||
BLE_HCI_LE_SET_PER_ADV_ENABLE_LEN, /* 0x0040: periodic adv. enable */
|
||||
BLE_HCI_LE_SET_EXT_SCAN_PARAM_LEN, /* 0x0041: set ext. scan param. */
|
||||
BLE_HCI_LE_SET_EXT_SCAN_ENABLE_LEN, /* 0x0042: set ext. scan enable */
|
||||
BLE_HCI_LE_EXT_CREATE_CONN_LEN, /* 0x0043: ext. create connection */
|
||||
BLE_HCI_LE_PER_ADV_CREATE_SYNC_LEN, /* 0x0044: periodic adv. create sync */
|
||||
0, /* 0x0045: periodic adv. create sync cancel */
|
||||
0, /* 0x0046: periodic adv. terminate sync */
|
||||
BLE_HCI_LE_ADD_DEV_TO_PER_ADV_LIST_LEN, /* 0x0047: add dev to per. adv. list */
|
||||
BLE_HCI_LE_REM_DEV_FROM_PER_ADV_LIST_LEN,/* 0x0048: remove dev from per. adv. list */
|
||||
0, /* 0x0049: clear periodic adv. list */
|
||||
0, /* 0x004A: read periodic list size */
|
||||
0, /* 0x004B: read transmit power */
|
||||
0, /* 0x004C: read RF path */
|
||||
BLE_HCI_LE_WR_RF_PATH_COMPENSATION_LEN, /* 0x004D: write RF path */
|
||||
BLE_HCI_LE_SET_PRIVACY_MODE_LEN, /* 0x004E: set privacy mode */
|
||||
};
|
||||
Reference in New Issue
Block a user