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

mesh: fix check to prevent delete of network key with message using that network key in config_netkey_delete_handler

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-18 22:58:47 +02:00
parent 74512e9d8d
commit 85f51b6478
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesh/mesh_configuration_server.c
View File

@ -746,7 +746,8 @@ static void config_netkey_delete_handler(mesh_model_t * mesh_model, mesh_pdu_t *
mesh_subnet_t * subnet = mesh_subnet_get_by_netkey_index(netkey_index); mesh_subnet_t * subnet = mesh_subnet_get_by_netkey_index(netkey_index);
if (subnet != NULL){ if (subnet != NULL){
// A NetKey shall not be deleted from the NetKey List using a message secured with this NetKey. // A NetKey shall not be deleted from the NetKey List using a message secured with this NetKey.
if (mesh_subnet_list_count() > 1 && subnet->netkey_index != netkey_index){ // Also prevents deleting the last network key
if (netkey_index != mesh_pdu_netkey_index(pdu)){
// remove all appkeys for this netkey // remove all appkeys for this netkey
mesh_transport_key_iterator_t it; mesh_transport_key_iterator_t it;
@ -771,7 +772,6 @@ static void config_netkey_delete_handler(mesh_model_t * mesh_model, mesh_pdu_t *
btstack_memory_mesh_subnet_free(subnet); btstack_memory_mesh_subnet_free(subnet);
} else { } else {
// we cannot remove the last network key
status = MESH_FOUNDATION_STATUS_CANNOT_REMOVE; status = MESH_FOUNDATION_STATUS_CANNOT_REMOVE;
} }
} }