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

mesh: load flags from provisioning data stored in tlv

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-17 14:26:20 +02:00
parent 155bc8e611
commit 9782639032
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesh/mesh.c
View File

@ -929,13 +929,11 @@ static void mesh_access_secure_network_beacon_handler(uint8_t packet_type, uint1
}
}
static uint32_t mesh_tag_for_prov_data(void){
return ((uint32_t) 'P' << 24) | ((uint32_t) 'R' << 16) | ((uint32_t) 'O' << 8) | (uint32_t)'V';
}
static const uint32_t mesh_tag_for_prov_data = ((uint32_t) 'P' << 24) | ((uint32_t) 'R' << 16) | ((uint32_t) 'O' << 8) | (uint32_t)'V';
void mesh_node_reset(void){
// PROV
btstack_tlv_singleton_impl->delete_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data());
btstack_tlv_singleton_impl->delete_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data);
// everything else
mesh_delete_network_keys();
mesh_delete_app_keys();
@ -958,11 +956,12 @@ static void mesh_node_store_provisioning_data(mesh_provisioning_data_t * provisi
mesh_persistent_provisioning_data_t persistent_provisioning_data;
persistent_provisioning_data.unicast_address = provisioning_data->unicast_address;
persistent_provisioning_data.flags = provisioning_data->flags;
memcpy(persistent_provisioning_data.device_key, provisioning_data->device_key, 16);
// store in tlv
btstack_tlv_get_instance(&btstack_tlv_singleton_impl, &btstack_tlv_singleton_context);
btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data(), (uint8_t *) &persistent_provisioning_data, sizeof(mesh_persistent_provisioning_data_t));
btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data, (uint8_t *) &persistent_provisioning_data, sizeof(mesh_persistent_provisioning_data_t));
// store IV Index and sequence number
mesh_store_iv_index_and_sequence_number(provisioning_data->iv_index, 0);
@ -1000,7 +999,7 @@ static int mesh_node_startup_from_tlv(void){
btstack_tlv_get_instance(&btstack_tlv_singleton_impl, &btstack_tlv_singleton_context);
// load provisioning data
uint32_t prov_len = btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data(), (uint8_t *) &persistent_provisioning_data, sizeof(mesh_persistent_provisioning_data_t));
uint32_t prov_len = btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, mesh_tag_for_prov_data, (uint8_t *) &persistent_provisioning_data, sizeof(mesh_persistent_provisioning_data_t));
printf("Provisioning data available: %u\n", prov_len ? 1 : 0);
int prov_data_valid = prov_len == sizeof(mesh_persistent_provisioning_data_t);
if (prov_data_valid){
@ -1012,6 +1011,8 @@ static int mesh_node_startup_from_tlv(void){
provisioning_data.flags = persistent_provisioning_data.flags;
provisioning_data.network_key = NULL;
printf("Flags %x, unicast_address %04x\n", persistent_provisioning_data.flags, provisioning_data.unicast_address);
// load iv index and sequence number
uint32_t iv_index;
uint32_t sequence_number;