espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix add white list failed

Browse Source
This commit is contained in:
zhiweijian
2020-12-17 16:43:00 +08:00
committed by bot
parent 5d514fdb35
commit 2e949ca9ac
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c
View File

@@ -285,6 +285,20 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_
} }
return FALSE; return FALSE;
} }
BD_ADDR invalid_rand_addr_a, invalid_rand_addr_b;
memset(invalid_rand_addr_a, 0xff, sizeof(BD_ADDR));
memset(invalid_rand_addr_b, 0x00, sizeof(BD_ADDR));
// look for public address information
tBTM_SEC_DEV_REC *p_dev_rec = btm_find_dev(bd_addr);
// p_dev_rec is created at bluetooth initialization, p_dev_rec->ble.static_addr maybe be all 0 before pairing
if(p_dev_rec && memcmp(invalid_rand_addr_b, p_dev_rec->ble.static_addr, BD_ADDR_LEN) != 0) {
memcpy(bd_addr, p_dev_rec->ble.static_addr, BD_ADDR_LEN);
addr_type = p_dev_rec->ble.static_addr_type;
}
// white list must be public address or static random address
if(addr_type == BLE_ADDR_RANDOM) { if(addr_type == BLE_ADDR_RANDOM) {
/* /*
A static address is a 48-bit randomly generated address and shall meet the following requirements: A static address is a 48-bit randomly generated address and shall meet the following requirements:
@@ -292,9 +306,6 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_
• All bits of the random part of the address shall not be equal to 1 • All bits of the random part of the address shall not be equal to 1
• All bits of the random part of the address shall not be equal to 0 • All bits of the random part of the address shall not be equal to 0
*/ */
BD_ADDR invalid_rand_addr_a, invalid_rand_addr_b;
memset(invalid_rand_addr_a, 0xff, sizeof(BD_ADDR));
memset(invalid_rand_addr_b, 0x00, sizeof(BD_ADDR));
invalid_rand_addr_b[0] = invalid_rand_addr_b[0] | BT_STATIC_RAND_ADDR_MASK; invalid_rand_addr_b[0] = invalid_rand_addr_b[0] | BT_STATIC_RAND_ADDR_MASK;
if((bd_addr[0] & BT_STATIC_RAND_ADDR_MASK) == BT_STATIC_RAND_ADDR_MASK if((bd_addr[0] & BT_STATIC_RAND_ADDR_MASK) == BT_STATIC_RAND_ADDR_MASK
&& memcmp(invalid_rand_addr_a, bd_addr, BD_ADDR_LEN) != 0 && memcmp(invalid_rand_addr_a, bd_addr, BD_ADDR_LEN) != 0