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

mesh: deliver access messages to all models

Browse Source
This commit is contained in:
Matthias Ringwald 2019-11-11 12:36:24 +01:00
parent 01be50610d
commit c659f2368a
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mesh/mesh_access.c
View File

@ -61,6 +61,9 @@ static void mesh_access_message_process_handler(mesh_pdu_t * pdu);
static void mesh_access_upper_transport_handler(mesh_transport_callback_type_t callback_type, mesh_transport_status_t status, mesh_pdu_t * pdu); static void mesh_access_upper_transport_handler(mesh_transport_callback_type_t callback_type, mesh_transport_status_t status, mesh_pdu_t * pdu);
static const mesh_operation_t * mesh_model_lookup_operation_by_opcode(mesh_model_t * model, uint32_t opcode); static const mesh_operation_t * mesh_model_lookup_operation_by_opcode(mesh_model_t * model, uint32_t opcode);
// receive
static uint16_t mesh_access_received_pdu_refcount;
// acknowledged messages // acknowledged messages
static btstack_linked_list_t mesh_access_acknowledged_messages; static btstack_linked_list_t mesh_access_acknowledged_messages;
static btstack_timer_source_t mesh_access_acknowledged_timer; static btstack_timer_source_t mesh_access_acknowledged_timer;
@ -813,12 +816,25 @@ static int mesh_access_validate_appkey_index(mesh_model_t * model, uint16_t appk
return mesh_model_contains_appkey(model, appkey_index); return mesh_model_contains_appkey(model, appkey_index);
} }
// decrease use count and report as free if done
void mesh_access_message_processed(mesh_pdu_t * pdu){
if (mesh_access_received_pdu_refcount > 0){
mesh_access_received_pdu_refcount--;
}
if (mesh_access_received_pdu_refcount == 0){
mesh_upper_transport_message_processed_by_higher_layer(pdu);
}
}
static void mesh_access_message_process_handler(mesh_pdu_t * pdu){ static void mesh_access_message_process_handler(mesh_pdu_t * pdu){
// init use count
mesh_access_received_pdu_refcount = 1;
// get opcode and size // get opcode and size
uint32_t opcode = 0; uint32_t opcode = 0;
uint16_t opcode_size = 0; uint16_t opcode_size = 0;
int ok = mesh_access_pdu_get_opcode( pdu, &opcode, &opcode_size); int ok = mesh_access_pdu_get_opcode( pdu, &opcode, &opcode_size);
if (!ok) { if (!ok) {
mesh_access_message_processed(pdu); mesh_access_message_processed(pdu);
@ -846,8 +862,8 @@ static void mesh_access_message_process_handler(mesh_pdu_t * pdu){
if (operation == NULL) continue; if (operation == NULL) continue;
if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue; if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue;
mesh_access_acknowledged_received(src, opcode); mesh_access_acknowledged_received(src, opcode);
mesh_access_received_pdu_refcount++;
operation->handler(model, pdu); operation->handler(model, pdu);
return;
} }
} }
} }
@ -867,7 +883,7 @@ static void mesh_access_message_process_handler(mesh_pdu_t * pdu){
break; break;
case MESH_ADDRESS_ALL_RELAYS: case MESH_ADDRESS_ALL_RELAYS:
if (mesh_foundation_relay_get() == 1){ if (mesh_foundation_relay_get() == 1){
deliver_to_primary_element =1; deliver_to_primary_element = 1;
} }
break; break;
case MESH_ADDRESS_ALL_NODES: case MESH_ADDRESS_ALL_NODES:
@ -886,8 +902,8 @@ static void mesh_access_message_process_handler(mesh_pdu_t * pdu){
if (operation == NULL) continue; if (operation == NULL) continue;
if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue; if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue;
mesh_access_acknowledged_received(src, opcode); mesh_access_acknowledged_received(src, opcode);
mesh_access_received_pdu_refcount++;
operation->handler(model, pdu); operation->handler(model, pdu);
return;
} }
} }
} }
@ -907,23 +923,18 @@ static void mesh_access_message_process_handler(mesh_pdu_t * pdu){
if (operation == NULL) continue; if (operation == NULL) continue;
if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue; if (mesh_access_validate_appkey_index(model, appkey_index) == 0) continue;
mesh_access_acknowledged_received(src, opcode); mesh_access_acknowledged_received(src, opcode);
mesh_access_received_pdu_refcount++;
operation->handler(model, pdu); operation->handler(model, pdu);
return;
} }
} }
} }
} }
} }
// operation not found -> done // we're done
printf("Message not handled\n");
mesh_access_message_processed(pdu); mesh_access_message_processed(pdu);
} }
void mesh_access_message_processed(mesh_pdu_t * pdu){
mesh_upper_transport_message_processed_by_higher_layer(pdu);
}
// Mesh Model Publication // Mesh Model Publication
static btstack_timer_source_t mesh_access_publication_timer; static btstack_timer_source_t mesh_access_publication_timer;