mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 21:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

manage internal whitelist

Browse Source
This commit is contained in:
Matthias Ringwald 2015-07-28 11:52:40 +02:00
parent 05c706dd2b
commit e83201bce5
2 changed files with 54 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/hci.c
View File

@ -1706,6 +1706,8 @@ static void hci_state_reset(void){
hci_stack->le_scanning_state = LE_SCAN_IDLE;
hci_stack->le_scan_type = 0xff;
hci_stack->le_connecting_state = LE_CONNECTING_IDLE;
hci_stack->le_whitelist = 0;
hci_stack->le_whitelist_capacity = 0;
hci_stack->le_connection_parameter_range.le_conn_interval_min = 0x0006;
hci_stack->le_connection_parameter_range.le_conn_interval_max = 0x0C80;
hci_stack->le_connection_parameter_range.le_conn_latency_min = 0x0000;
@ -3087,9 +3089,18 @@ le_command_status_t gap_disconnect(hci_con_handle_t handle){
* @param address
* @returns 0 if ok
*/
int gap_auto_connection_start(uint8_t address_typ, bd_addr_t address){
int gap_auto_connection_start(uint8_t address_type, bd_addr_t address){
log_error("gap_auto_connection_start not implemented yet");
return 1;
// check capacity
int num_entries = linked_list_count(&hci_stack->le_whitelist);
if (num_entries > hci_stack->le_whitelist_capacity) return ERROR_CODE_MEMORY_CAPACITY_EXCEEDED;
whitelist_entry_t * entry = btstack_memory_whitelist_entry_get();
if (!entry) return BTSTACK_MEMORY_ALLOC_FAILED;
entry->address_type = address_type;
memcpy(entry->address, address, 6);
entry->state = LE_WHITELIST_ADD_TO_CONTROLLER;
hci_run();
return 0;
}
/**
@ -3098,9 +3109,25 @@ int gap_auto_connection_start(uint8_t address_typ, bd_addr_t address){
* @param address
* @returns 0 if ok
*/
int gap_auto_connection_stop(uint8_t address_typ, bd_addr_t address){
int gap_auto_connection_stop(uint8_t address_type, bd_addr_t address){
log_error("gap_auto_connection_stop not implemented yet");
return 1;
linked_list_iterator_t it;
linked_list_iterator_init(&it, &hci_stack->le_whitelist);
while (linked_list_iterator_has_next(&it)){
whitelist_entry_t * entry = (whitelist_entry_t*) linked_list_iterator_next(&it);
if (entry->address_type != address_type) continue;
if (memcmp(entry->address, address, 6) != 0) continue;
if (entry->state & LE_WHITELIST_ON_CONTROLLER){
// remove from controller if already present
entry->state |= LE_WHITELIST_REMOVE_FROM_CONTROLLER;
continue;
}
// direclty remove entry from whitelist
linked_list_iterator_remove(&it);
btstack_memory_whitelist_entry_free(entry);
}
hci_run();
return 0;
}
/**
@ -3109,6 +3136,19 @@ int gap_auto_connection_stop(uint8_t address_typ, bd_addr_t address){
*/
void gap_auto_connection_stop_all(void){
log_error("gap_auto_connection_stop_all not implemented yet");
linked_list_iterator_t it;
while (linked_list_iterator_has_next(&it)){
whitelist_entry_t * entry = (whitelist_entry_t*) linked_list_iterator_next(&it);
if (entry->state & LE_WHITELIST_ON_CONTROLLER){
// remove from controller if already present
entry->state |= LE_WHITELIST_REMOVE_FROM_CONTROLLER;
continue;
}
// direclty remove entry from whitelist
linked_list_iterator_remove(&it);
btstack_memory_whitelist_entry_free(entry);
}
hci_run();
}
/**

19
src/hci.h
View File

@ -601,21 +601,21 @@ typedef enum hci_init_state{
} hci_substate_t;
enum {
LE_ADVERTISEMENT_TASKS_DISABLE = 1 << 0,
LE_ADVERTISEMENT_TASKS_SET_DATA = 1 << 1,
LE_ADVERTISEMENT_TASKS_SET_PARAMS = 1 << 2,
LE_ADVERTISEMENT_TASKS_ENABLE = 1 << 3,
LE_ADVERTISEMENT_TASKS_DISABLE = 1 << 0,
LE_ADVERTISEMENT_TASKS_SET_DATA = 1 << 1,
LE_ADVERTISEMENT_TASKS_SET_PARAMS = 1 << 2,
LE_ADVERTISEMENT_TASKS_ENABLE = 1 << 3,
};
enum {
LE_WHITELIST_ON_CONTROLLER = 1 << 0,
LE_WHITELIST_ADD_TO_CONTROLLER = 1 << 1,
LE_WHITELIST_REMOVE_FROM_CONTROLLR = 1 << 2,
LE_WHITELIST_ON_CONTROLLER = 1 << 0,
LE_WHITELIST_ADD_TO_CONTROLLER = 1 << 1,
LE_WHITELIST_REMOVE_FROM_CONTROLLER = 1 << 2,
};
typedef struct {
bd_addr_t addr;
bd_addr_type_t type;
bd_addr_t address;
bd_addr_type_t address_type;
uint8_t state;
} whitelist_entry_t;
@ -732,6 +732,7 @@ typedef struct {
// LE Whitelist Management
uint16_t le_whitelist_capacity;
linked_list_t le_whitelist;
// custom BD ADDR
bd_addr_t custom_bd_addr;