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

mesh: warn when using AppKeys with high appkey index or using more models than the number of models that get persisted

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-06 18:17:34 +02:00
parent f53a82f230
commit 37849b31e5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/mesh/mesh.c
View File

@ -351,7 +351,12 @@ typedef struct {
uint8_t key[16];
} mesh_persistent_app_key_t;
#define MESH_APPKEY_INDEX_MAX (16)
void mesh_store_app_key(uint16_t netkey_index, uint16_t appkey_index, uint8_t aid, const uint8_t * application_key){
if (application_key >= MESH_APPKEY_INDEX_MAX){
printf("Warning: AppKey with AppKey Index %x (>= %u) are not persisted\n", appkey_index, MESH_APPKEY_INDEX_MAX);
}
mesh_persistent_app_key_t data;
printf("Store AppKey: AppKey Index 0x%06x, AID %02x: ", appkey_index, aid);
printf_hexdump(application_key, 16);
@ -387,8 +392,6 @@ static void mesh_delete_app_key(uint16_t appkey_index){
btstack_tlv_singleton_impl->delete_tag(btstack_tlv_singleton_context, tag);
}
#define MESH_APPKEY_INDEX_MAX (16)
static void mesh_load_app_keys(void){
printf("Load App Keys\n");
// TODO: use TLV iterator
@ -463,6 +466,9 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
// load app keys
mesh_load_app_keys();
#if defined(ENABLE_MESH_ADV_BEARER) || defined(ENABLE_MESH_PB_ADV)
// load model to appkey bindings
mesh_load_appkey_lists();
// setup scanning
gap_set_scan_parameters(0, 0x300, 0x300);
gap_start_scan();
@ -1556,6 +1562,8 @@ static mesh_model_t * mesh_model_get_by_identifier(mesh_element_t * element, uin
// model to appkey list/binding
#define MESH_MODEL_INDEX_MAX (16)
static uint32_t mesh_model_tag_for_index(uint16_t internal_model_id){
return ((uint32_t) 'M' << 24) | ((uint32_t) 'B' << 16) | ((uint32_t) internal_model_id);
}
@ -1566,12 +1574,14 @@ static void mesh_load_appkey_list(mesh_model_t * model){
}
static void mesh_store_appkey_list(mesh_model_t * model){
if (model->mid >= MESH_MODEL_INDEX_MAX){
printf("Warning: Model with internal model id %x (>= %u) are not persisted\n", model->mid, MESH_MODEL_INDEX_MAX);
}
uint32_t tag = mesh_model_tag_for_index(model->mid);
btstack_tlv_singleton_impl->get_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &model->appkey_indices, sizeof(model->appkey_indices));
}
#define MESH_MODEL_INDEX_MAX (16)
static void mesh_load_appkey_lists(void){
printf("Load Appkey Lists\n");
// iterate over elements and models