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

mesh: report invalid netkey index on for node identity get

Browse Source
This commit is contained in:
Matthias Ringwald 2019-08-16 14:59:06 +02:00
parent 556837365d
commit 89b2d435cd
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mesh/mesh_configuration_server.c
View File

@ -2157,16 +2157,7 @@ static void config_node_identity_get_handler(mesh_model_t *mesh_model, mesh_pdu_
uint16_t netkey_index = mesh_access_parser_get_u16(&parser);
mesh_node_identity_state_t node_identity_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_NOT_SUPPORTED;
uint8_t status = MESH_FOUNDATION_STATUS_SUCCESS;
#ifdef ENABLE_MESH_PROXY_SERVER
status = mesh_proxy_get_advertising_with_node_id_status(netkey_index, &node_identity_state);
#else
mesh_subnet_t * network_key = mesh_subnet_get_by_netkey_index(netkey_index);
if (network_key == NULL){
status = MESH_FOUNDATION_STATUS_INVALID_NETKEY_INDEX;
node_identity_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_STOPPED;
}
#endif
uint8_t status = mesh_proxy_get_advertising_with_node_id_status(netkey_index, &node_identity_state);
config_node_identity_status(mesh_model, mesh_pdu_netkey_index(pdu), mesh_pdu_src(pdu), status, netkey_index, node_identity_state);
mesh_access_message_processed(pdu);

10
src/mesh/mesh_proxy.c
View File

@ -220,14 +220,14 @@ static void mesh_proxy_stop_advertising_with_node_id(uint16_t netkey_index){
// Public API
uint8_t mesh_proxy_get_advertising_with_node_id_status(uint16_t netkey_index, mesh_node_identity_state_t * out_state ){
mesh_subnet_t * network_key = mesh_subnet_get_by_netkey_index(netkey_index);
if (network_key == NULL){
*out_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_NOT_SUPPORTED;
return MESH_FOUNDATION_STATUS_SUCCESS;
mesh_subnet_t * mesh_subnet = mesh_subnet_get_by_netkey_index(netkey_index);
if (mesh_subnet == NULL){
*out_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_STOPPED;
return MESH_FOUNDATION_STATUS_INVALID_NETKEY_INDEX;
}
#ifdef ENABLE_MESH_PROXY_SERVER
if (network_key->node_id_advertisement_running == 0){
if (mesh_subnet->node_id_advertisement_running == 0){
*out_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_STOPPED;
} else {
*out_state = MESH_NODE_IDENTITY_STATE_ADVERTISING_RUNNING;