mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: extract hci_whitelist_modification_process

Browse Source
This commit is contained in:
Matthias Ringwald 2024-04-17 15:12:01 +02:00
parent 81ae6c3b92
commit 2c052b15cd
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/hci.c
View File

@ -6105,7 +6105,7 @@ static uint8_t hci_le_extended_advertising_operation_for_chunk(uint16_t pos, uin
#endif #endif
#endif #endif
static bool hci_whitelist_modification_pending() { static bool hci_whitelist_modification_pending(void) {
btstack_linked_list_iterator_t it; btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &hci_stack->le_whitelist); btstack_linked_list_iterator_init(&it, &hci_stack->le_whitelist);
while (btstack_linked_list_iterator_has_next(&it)){ while (btstack_linked_list_iterator_has_next(&it)){
@ -6117,6 +6117,36 @@ static bool hci_whitelist_modification_pending() {
return false; return false;
} }
static bool hci_whitelist_modification_process(void){
// add/remove entries
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &hci_stack->le_whitelist);
while (btstack_linked_list_iterator_has_next(&it)){
whitelist_entry_t * entry = (whitelist_entry_t*) btstack_linked_list_iterator_next(&it);
if (entry->state & LE_WHITELIST_REMOVE_FROM_CONTROLLER){
entry->state &= ~LE_WHITELIST_REMOVE_FROM_CONTROLLER;
entry->state &= ~LE_WHITELIST_ON_CONTROLLER;
bd_addr_type_t address_type = entry->address_type;
bd_addr_t address;
memcpy(address, entry->address, 6);
if ((entry->state & LE_WHITELIST_ADD_TO_CONTROLLER) == 0){
// remove from whitelist if not scheduled for re-addition
btstack_linked_list_remove(&hci_stack->le_whitelist, (btstack_linked_item_t *) entry);
btstack_memory_whitelist_entry_free(entry);
}
hci_send_cmd(&hci_le_remove_device_from_white_list, address_type, address);
return true;
}
if (entry->state & LE_WHITELIST_ADD_TO_CONTROLLER){
entry->state &= ~LE_WHITELIST_ADD_TO_CONTROLLER;
entry->state |= LE_WHITELIST_ON_CONTROLLER;
hci_send_cmd(&hci_le_add_device_to_white_list, entry->address_type, entry->address);
return true;
}
}
return false;
}
static bool hci_run_general_gap_le(void){ static bool hci_run_general_gap_le(void){
btstack_linked_list_iterator_t lit; btstack_linked_list_iterator_t lit;
@ -6669,31 +6699,8 @@ static bool hci_run_general_gap_le(void){
// LE Whitelist Management // LE Whitelist Management
if (whitelist_modification_pending){ if (whitelist_modification_pending){
// add/remove entries bool done = hci_whitelist_modification_process();
btstack_linked_list_iterator_init(&lit, &hci_stack->le_whitelist); if (done) return true;
while (btstack_linked_list_iterator_has_next(&lit)){
whitelist_entry_t * entry = (whitelist_entry_t*) btstack_linked_list_iterator_next(&lit);
if (entry->state & LE_WHITELIST_REMOVE_FROM_CONTROLLER){
entry->state &= ~LE_WHITELIST_REMOVE_FROM_CONTROLLER;
entry->state &= ~LE_WHITELIST_ON_CONTROLLER;
bd_addr_type_t address_type = entry->address_type;
bd_addr_t address;
memcpy(address, entry->address, 6);
if ((entry->state & LE_WHITELIST_ADD_TO_CONTROLLER) == 0){
// remove from whitelist if not scheduled for re-addition
btstack_linked_list_remove(&hci_stack->le_whitelist, (btstack_linked_item_t *) entry);
btstack_memory_whitelist_entry_free(entry);
}
hci_send_cmd(&hci_le_remove_device_from_white_list, address_type, address);
return true;
}
if (entry->state & LE_WHITELIST_ADD_TO_CONTROLLER){
entry->state &= ~LE_WHITELIST_ADD_TO_CONTROLLER;
entry->state |= LE_WHITELIST_ON_CONTROLLER;
hci_send_cmd(&hci_le_add_device_to_white_list, entry->address_type, entry->address);
return true;
}
}
} }
#ifdef ENABLE_LE_PRIVACY_ADDRESS_RESOLUTION #ifdef ENABLE_LE_PRIVACY_ADDRESS_RESOLUTION