mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-24 04:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

sm: extract sm_le_device_db_index_lookup

Browse Source
This commit is contained in:
Matthias Ringwald 2023-07-13 17:34:39 +02:00
parent 94219034bf
commit 22cb578bdc
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ble/sm.c
View File

@ -1534,15 +1534,15 @@ static void sm_pairing_error(sm_connection_t * sm_conn, uint8_t reason){
sm_conn->sm_engine_state = SM_GENERAL_SEND_PAIRING_FAILED; sm_conn->sm_engine_state = SM_GENERAL_SEND_PAIRING_FAILED;
} }
static int sm_lookup_by_address(void) { static int sm_le_device_db_index_lookup(bd_addr_type_t address_type, bd_addr_t address){
int i; int i;
for (i=0; i < le_device_db_max_count(); i++){ for (i=0; i < le_device_db_max_count(); i++){
bd_addr_t address; bd_addr_t db_address;
int address_type = BD_ADDR_TYPE_UNKNOWN; int db_address_type = BD_ADDR_TYPE_UNKNOWN;
le_device_db_info(i, &address_type, address, NULL); le_device_db_info(i, &db_address_type, db_address, NULL);
// skip unused entries // skip unused entries
if (address_type == BD_ADDR_TYPE_UNKNOWN) continue; if (address_type == BD_ADDR_TYPE_UNKNOWN) continue;
if ((address_type == BD_ADDR_TYPE_LE_PUBLIC) && (memcmp(address, setup->sm_peer_address, 6) == 0)){ if ((address_type == db_address_type) && (memcmp(address, db_address, 6) == 0)){
return i; return i;
} }
} }
@ -1561,7 +1561,7 @@ static void sm_remove_le_device_db_entry(uint16_t i) {
static uint8_t sm_key_distribution_validate_received(sm_connection_t * sm_conn){ static uint8_t sm_key_distribution_validate_received(sm_connection_t * sm_conn){
// if identity is provided, abort if we have bonding with same address but different irk // if identity is provided, abort if we have bonding with same address but different irk
if (setup->sm_key_distribution_received_set & SM_KEYDIST_FLAG_IDENTITY_INFORMATION){ if (setup->sm_key_distribution_received_set & SM_KEYDIST_FLAG_IDENTITY_INFORMATION){
int index = sm_lookup_by_address(); int index = sm_le_device_db_index_lookup(BD_ADDR_TYPE_LE_PUBLIC, setup->sm_peer_address);
if (index >= 0){ if (index >= 0){
sm_key_t irk; sm_key_t irk;
le_device_db_info(index, NULL, NULL, irk); le_device_db_info(index, NULL, NULL, irk);
@ -5424,16 +5424,8 @@ const uint8_t * gap_get_persistent_irk(void){
} }
void gap_delete_bonding(bd_addr_type_t address_type, bd_addr_t address){ void gap_delete_bonding(bd_addr_type_t address_type, bd_addr_t address){
uint16_t i; int index = sm_le_device_db_index_lookup(address_type, address);
for (i=0; i < le_device_db_max_count(); i++){ if (index >= 0){
bd_addr_t entry_address; sm_remove_le_device_db_entry(index);
int entry_address_type = BD_ADDR_TYPE_UNKNOWN;
le_device_db_info(i, &entry_address_type, entry_address, NULL);
// skip unused entries
if (entry_address_type == (int) BD_ADDR_TYPE_UNKNOWN) continue;
if ((entry_address_type == (int) address_type) && (memcmp(entry_address, address, 6) == 0)){
sm_remove_le_device_db_entry(i);
break;
}
} }
} }