mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-03 07:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh/health_server: handle unknown company id or test id

Browse Source
This commit is contained in:
Matthias Ringwald 2019-10-30 15:54:38 +01:00
parent fe93465675
commit 8c3235ab0e
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mesh/mesh_health_server.c
View File

@ -177,9 +177,13 @@ static void health_fault_test_process_message(mesh_model_t *mesh_model, mesh_pdu
uint16_t netkey_index = mesh_pdu_netkey_index(pdu);
uint16_t appkey_index = mesh_pdu_appkey_index(pdu);
// short-cut if not packet handler set
// short-cut if not packet handler set, but only for standard test with our company id
if (mesh_model->model_packet_handler == NULL){
mesh_health_server_report_test_done(element_index, dest, netkey_index, appkey_index, test_id, company_id);
if ((test_id == 0) && (company_id == mesh_node_get_company_id())) {
mesh_health_server_report_test_done(element_index, dest, netkey_index, appkey_index, test_id, company_id);
} else {
mesh_health_server_report_test_not_supported(element_index, dest, netkey_index, appkey_index, test_id, company_id);
}
return;
}
@ -220,6 +224,22 @@ static void health_fault_test_unacknowledged_handler(mesh_model_t * mesh_model,
mesh_access_message_processed(pdu);
}
void mesh_health_server_report_test_not_supported(uint16_t element_index, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t test_id, uint16_t company_id){
UNUSED(element_index);
UNUSED(dest);
UNUSED(netkey_index);
UNUSED(appkey_index);
UNUSED(test_id);
UNUSED(company_id);
// report acknowledged message processed
if (processed_pdu != NULL){
mesh_pdu_t * pdu = processed_pdu;
processed_pdu = NULL;
mesh_access_message_processed(pdu);
}
}
void mesh_health_server_report_test_done(uint16_t element_index, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t test_id, uint16_t company_id){
mesh_element_t * element = mesh_node_element_for_index(element_index);
if (element == NULL) return;
@ -231,8 +251,9 @@ void mesh_health_server_report_test_done(uint16_t element_index, uint16_t dest,
// response for acknowledged health fault test
if (processed_pdu != NULL){
mesh_access_message_processed(processed_pdu);
mesh_pdu_t * pdu = processed_pdu;
processed_pdu = NULL;
mesh_access_message_processed(pdu);
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) health_fault_status(mesh_model, MESH_FOUNDATION_OPERATION_HEALTH_FAULT_STATUS, company_id, company_id);
if (!transport_pdu) return;

5
src/mesh/mesh_health_server.h
View File

@ -61,6 +61,11 @@ void mesh_health_server_register_packet_handler(mesh_model_t *mesh_model, btstac
*/
void mesh_health_server_report_test_done(uint16_t element_index, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t test_id, uint16_t company_id);
/**
* @brief Notify health server that test is not supported (wrong company or test id)
*/
void mesh_health_server_report_test_not_supported(uint16_t element_index, uint16_t dest, uint16_t netkey_index, uint16_t appkey_index, uint8_t test_id, uint16_t company_id);
/**
* @brief Provide fault state memory
* @param mesh_model for health server