mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-02 07:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: improve naming in mesh_proxy

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-25 11:50:54 +02:00
parent 92c33ebfc3
commit d3f5f493d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/mesh/mesh_proxy.c
View File

@ -68,7 +68,7 @@ static uint8_t mesh_proxy_node_id_rando
static uint16_t primary_element_address; static uint16_t primary_element_address;
// Mesh Proxy, advertise with node id // Mesh Proxy, advertise with node id
static adv_bearer_connectable_advertisement_data_item_t connectable_advertisement_item; static adv_bearer_connectable_advertisement_data_item_t connectable_advertisement_with_node_id;
static const uint8_t adv_data_with_node_identity_template[] = { static const uint8_t adv_data_with_node_identity_template[] = {
// Flags general discoverable, BR/EDR not supported // Flags general discoverable, BR/EDR not supported
@ -84,12 +84,12 @@ static const uint8_t adv_data_with_node_identity_template[] = {
}; };
static void mesh_proxy_stop_all_advertising_with_node_id(void){ static void mesh_proxy_stop_all_advertising_with_node_id(void){
adv_bearer_advertisements_remove_item(&connectable_advertisement_with_node_id);
mesh_network_key_iterator_t it; mesh_network_key_iterator_t it;
mesh_network_key_iterator_init(&it); mesh_network_key_iterator_init(&it);
while (mesh_network_key_iterator_has_more(&it)){ while (mesh_network_key_iterator_has_more(&it)){
mesh_network_key_t * network_key = mesh_network_key_iterator_get_next(&it); mesh_network_key_t * network_key = mesh_network_key_iterator_get_next(&it);
if (network_key->node_id_advertisement_running != 0){ if (network_key->node_id_advertisement_running != 0){
adv_bearer_advertisements_remove_item(&network_key->advertisement_with_network_id);
btstack_run_loop_remove_timer(&mesh_proxy_node_id_timer); btstack_run_loop_remove_timer(&mesh_proxy_node_id_timer);
network_key->node_id_advertisement_running = 0; network_key->node_id_advertisement_running = 0;
} }
@ -104,12 +104,12 @@ static void mesh_proxy_node_id_timeout_handler(btstack_timer_source_t * ts){
static void mesh_proxy_node_id_handle_get_aes128(void * arg){ static void mesh_proxy_node_id_handle_get_aes128(void * arg){
mesh_network_key_t * network_key = (mesh_network_key_t *) arg; mesh_network_key_t * network_key = (mesh_network_key_t *) arg;
memcpy(connectable_advertisement_item.adv_data, adv_data_with_node_identity_template, 12); memcpy(connectable_advertisement_with_node_id.adv_data, adv_data_with_node_identity_template, 12);
memcpy(&connectable_advertisement_item.adv_data[12], &mesh_proxy_node_id_hash[8], 8); memcpy(&connectable_advertisement_with_node_id.adv_data[12], &mesh_proxy_node_id_hash[8], 8);
memcpy(&connectable_advertisement_item.adv_data[20], mesh_proxy_node_id_random_value, 8); memcpy(&connectable_advertisement_with_node_id.adv_data[20], mesh_proxy_node_id_random_value, 8);
// setup advertisements // setup advertisements
adv_bearer_advertisements_add_item(&connectable_advertisement_item); adv_bearer_advertisements_add_item(&connectable_advertisement_with_node_id);
adv_bearer_advertisements_enable(1); adv_bearer_advertisements_enable(1);
// set timer // set timer