michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Use RPA in scanner only if available

Browse source 
Whenever trying to generate a local RPA to send a scan request or a conn
ind, verify that it can be generated (i.e. no NULL IRK provided by the
Host) and fall back to using the public/random address if required.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2017-08-03 17:50:04 +02:00
commit 6e42c2af3b
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/controller/ll_sw/ctrl.c
View file

@ -1218,6 +1218,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
u32_t conn_offset_us;
u32_t ticker_status;
u32_t conn_space_us;
bt_addr_t *lrpa;
if (IS_ENABLED(CONFIG_BLUETOOTH_CONTROLLER_CHAN_SEL_2)) {
radio_pdu_node_rx = packet_rx_reserve_get(4);
@ -1248,9 +1249,8 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr;
pdu_adv_tx->len = sizeof(struct pdu_adv_payload_connect_ind);
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY)
if (_radio.scanner.rpa_gen && rl_idx != FILTER_IDX_NONE) {
bt_addr_t *lrpa = ctrl_lrpa_get(rl_idx);
LL_ASSERT(lrpa);
if (_radio.scanner.rpa_gen && rl_idx != FILTER_IDX_NONE &&
(lrpa = ctrl_lrpa_get(rl_idx))) {
pdu_adv_tx->tx_addr = 1;
memcpy(&pdu_adv_tx->payload.connect_ind.init_addr[0],
lrpa->val, BDADDR_SIZE);
@ -1473,6 +1473,7 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
(_radio.scanner.type != 0) &&
(_radio.scanner.conn == 0)) {
struct pdu_adv *pdu_adv_tx;
bt_addr_t *lrpa;
u32_t err;
/* save the adv packet */
@ -1487,9 +1488,8 @@ static inline u32_t isr_rx_scan(u8_t devmatch_ok, u8_t devmatch_id,
pdu_adv_tx->rx_addr = pdu_adv_rx->tx_addr;
pdu_adv_tx->len = sizeof(struct pdu_adv_payload_scan_req);
#if defined(CONFIG_BLUETOOTH_CONTROLLER_PRIVACY)
if (_radio.scanner.rpa_gen && rl_idx != FILTER_IDX_NONE) {
bt_addr_t *lrpa = ctrl_lrpa_get(rl_idx);
LL_ASSERT(lrpa);
if (_radio.scanner.rpa_gen && rl_idx != FILTER_IDX_NONE &&
(lrpa = ctrl_lrpa_get(rl_idx))) {
pdu_adv_tx->tx_addr = 1;
memcpy(&pdu_adv_tx->payload.scan_req.adv_addr[0],
lrpa->val, BDADDR_SIZE);