michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: Fix local RPA not valid in connection complete

Browse source 
Fix connection complete event handling when the local RPA is not valid.
This can happen when the controller was not instructed to use an RPA
address, or the local IRK was set to an all zero IRK.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-03-03 17:02:51 +01:00 • committed by Johan Hedberg
commit f19b7a6e69
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/host/hci_core.c
View file

@ -1456,7 +1456,8 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
conn->role == BT_HCI_ROLE_SLAVE) {
bt_addr_le_copy(&conn->le.init_addr, &peer_addr);
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
bt_addr_cmp(&evt->local_rpa, BT_ADDR_ANY) != 0) {
bt_addr_copy(&conn->le.resp_addr.a, &evt->local_rpa);
conn->le.resp_addr.type = BT_ADDR_LE_RANDOM;
} else {
@ -1479,7 +1480,8 @@ static void enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
conn->role == BT_HCI_ROLE_MASTER) {
bt_addr_le_copy(&conn->le.resp_addr, &peer_addr);
if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
bt_addr_cmp(&evt->local_rpa, BT_ADDR_ANY) != 0) {
bt_addr_copy(&conn->le.init_addr.a, &evt->local_rpa);
conn->le.init_addr.type = BT_ADDR_LE_RANDOM;
} else {