michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix bug in LE create conn with filter policy

Browse source 
Fix bug when connecting using whitelist and split controller.
The peer address was set to an all zeroes address.

Bug using shell:
bt init
bt wl-add <addr>
bt wl-connect on
Connected: 00:00:00:00:00:00 (public)

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-01-07 12:22:05 +01:00 • committed by Johan Hedberg
commit f5d2b3271a
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/bluetooth/controller/ll_sw/ull_master.c
View file

@ -428,12 +428,14 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
{ {
u32_t conn_offset_us, conn_interval_us; u32_t conn_offset_us, conn_interval_us;
u8_t ticker_id_scan, ticker_id_conn; u8_t ticker_id_scan, ticker_id_conn;
u8_t peer_addr[BDADDR_SIZE];
u32_t ticks_slot_overhead; u32_t ticks_slot_overhead;
u32_t ticks_slot_offset; u32_t ticks_slot_offset;
struct ll_scan_set *scan; struct ll_scan_set *scan;
struct node_rx_cc *cc; struct node_rx_cc *cc;
struct ll_conn *conn; struct ll_conn *conn;
struct pdu_adv *pdu_tx; struct pdu_adv *pdu_tx;
u8_t peer_addr_type;
u32_t ticker_status; u32_t ticker_status;
u8_t chan_sel; u8_t chan_sel;
@ -447,12 +449,12 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
#if defined(CONFIG_BT_CTLR_PRIVACY) #if defined(CONFIG_BT_CTLR_PRIVACY)
u8_t own_addr_type = pdu_tx->tx_addr; u8_t own_addr_type = pdu_tx->tx_addr;
u8_t own_addr[BDADDR_SIZE]; u8_t own_addr[BDADDR_SIZE];
u8_t peer_addr[BDADDR_SIZE];
u8_t rl_idx = ftr->rl_idx; u8_t rl_idx = ftr->rl_idx;
memcpy(own_addr, &pdu_tx->connect_ind.init_addr[0], BDADDR_SIZE); memcpy(own_addr, &pdu_tx->connect_ind.init_addr[0], BDADDR_SIZE);
memcpy(peer_addr, &pdu_tx->connect_ind.adv_addr[0], BDADDR_SIZE);
#endif #endif
peer_addr_type = pdu_tx->rx_addr;
memcpy(peer_addr, &pdu_tx->connect_ind.adv_addr[0], BDADDR_SIZE);
/* This is the chan sel bit from the received adv pdu */ /* This is the chan sel bit from the received adv pdu */
chan_sel = pdu_tx->chan_sel; chan_sel = pdu_tx->chan_sel;
@ -480,8 +482,8 @@ void ull_master_setup(memq_link_t *link, struct node_rx_hdr *rx,
#else #else
if (1) { if (1) {
#endif /* CONFIG_BT_CTLR_PRIVACY */ #endif /* CONFIG_BT_CTLR_PRIVACY */
cc->peer_addr_type = scan->lll.adv_addr_type; cc->peer_addr_type = peer_addr_type;
memcpy(cc->peer_addr, scan->lll.adv_addr, BDADDR_SIZE); memcpy(cc->peer_addr, &peer_addr[0], BDADDR_SIZE);
} }
cc->interval = lll->interval; cc->interval = lll->interval;