michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix Extended Advertising Report generation

Browse source 
Fix Extended Advertising Report generation that skipped
population of AD data when there was no extended header.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-11-05 18:09:52 +05:30 • committed by Carles Cufí
commit 5b62fae902
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
subsys/bluetooth/controller/hci/hci.c
View file

@ -4027,8 +4027,8 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
int8_t tx_pwr = 0x7f; int8_t tx_pwr = 0x7f;
uint8_t *data = NULL; uint8_t *data = NULL;
uint8_t sec_phy = 0U; uint8_t sec_phy = 0U;
int8_t rssi = 0x7f;
uint8_t info_len; uint8_t info_len;
int8_t rssi;
#if defined(CONFIG_BT_CTLR_PRIVACY) #if defined(CONFIG_BT_CTLR_PRIVACY)
uint8_t rl_idx; uint8_t rl_idx;
@ -4069,7 +4069,7 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
p = (void *)&adv->adv_ext_ind; p = (void *)&adv->adv_ext_ind;
h = (void *)p->ext_hdr_adi_adv_data; h = (void *)p->ext_hdr_adi_adv_data;
ptr = (uint8_t *)h + sizeof(*h); ptr = (void *)h;
BT_DBG(" Ext. adv mode= 0x%x, hdr len= %u", p->adv_mode, BT_DBG(" Ext. adv mode= 0x%x, hdr len= %u", p->adv_mode,
p->ext_hdr_len); p->ext_hdr_len);
@ -4077,9 +4077,14 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
evt_type_curr = p->adv_mode; evt_type_curr = p->adv_mode;
if (!p->ext_hdr_len) { if (!p->ext_hdr_len) {
hdr_len = offsetof(struct pdu_adv_com_ext_adv,
ext_hdr_adi_adv_data);
goto no_ext_hdr; goto no_ext_hdr;
} }
ptr += sizeof(*h);
if (h->adv_addr) { if (h->adv_addr) {
bt_addr_le_t addr; bt_addr_le_t addr;
@ -4188,16 +4193,16 @@ static void le_ext_adv_report(struct pdu_data *pdu_data,
BT_DBG("ACAD: <todo>"); BT_DBG("ACAD: <todo>");
} }
if (hdr_len < adv->len) {
data_len_curr = adv->len - hdr_len;
data_curr = ptr;
BT_DBG(" AD Data (%u): <todo>", data_len);
}
} }
no_ext_hdr: no_ext_hdr:
if (hdr_len < adv->len) {
data_len_curr = adv->len - hdr_len;
data_curr = ptr;
BT_DBG(" AD Data (%u): <todo>", data_len);
}
if (node_rx_curr == node_rx) { if (node_rx_curr == node_rx) {
evt_type = evt_type_curr; evt_type = evt_type_curr;
adv_addr_type = adv_addr_type_curr; adv_addr_type = adv_addr_type_curr;