mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-27 03:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: fix handling of segmented control message

Browse Source
This commit is contained in:
Matthias Ringwald 2020-05-15 23:05:46 +02:00
parent 3fe2a56c5e
commit 37b8d44441
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesh/mesh.c
View File

@ -1172,7 +1172,8 @@ static int mesh_node_startup_from_tlv(void){
static void mesh_control_message_handler(mesh_transport_callback_type_t callback_type, mesh_transport_status_t status, mesh_pdu_t * pdu){
// get opcode
uint8_t opcode = mesh_pdu_control_opcode(pdu);
printf("Opcode: 0x%02x\n", opcode);
printf("MESH Control Message, Opcode: 0x%02x + ", opcode);
printf_hexdump(mesh_pdu_data(pdu), mesh_pdu_len(pdu));
uint8_t init_ttl;
uint8_t hops = 0;

6
src/mesh/mesh_access.c
View File

@ -459,6 +459,8 @@ uint16_t mesh_pdu_len(mesh_pdu_t * pdu){
switch (pdu->pdu_type){
case MESH_PDU_TYPE_ACCESS:
return ((mesh_access_pdu_t*) pdu)->len;
case MESH_PDU_TYPE_CONTROL:
return ((mesh_control_pdu_t*) pdu)->len;
case MESH_PDU_TYPE_NETWORK:
return ((mesh_network_pdu_t *) pdu)->len - 10;
default:
@ -471,6 +473,8 @@ uint8_t * mesh_pdu_data(mesh_pdu_t * pdu){
switch (pdu->pdu_type){
case MESH_PDU_TYPE_ACCESS:
return ((mesh_access_pdu_t*) pdu)->data;
case MESH_PDU_TYPE_CONTROL:
return ((mesh_control_pdu_t*) pdu)->data;
case MESH_PDU_TYPE_NETWORK:
return &((mesh_network_pdu_t *) pdu)->data[10];
default:
@ -483,6 +487,8 @@ uint8_t mesh_pdu_control_opcode(mesh_pdu_t * pdu){
switch (pdu->pdu_type){
case MESH_PDU_TYPE_NETWORK:
return mesh_network_control_opcode((mesh_network_pdu_t *) pdu);
case MESH_PDU_TYPE_CONTROL:
return ((mesh_control_pdu_t *) pdu)->akf_aid_control;
default:
btstack_assert(false);
return 0xff;

12
src/mesh/mesh_upper_transport.c
View File

@ -893,11 +893,11 @@ static void mesh_upper_transport_run(void){
incoming_control_pdu->len = segmented_pdu->len;
incoming_control_pdu->netkey_index = segmented_pdu->netkey_index;
incoming_control_pdu->akf_aid_control = segmented_pdu->akf_aid_control;
incoming_access_decrypted->ivi_nid = segmented_pdu->ivi_nid;
incoming_access_decrypted->ctl_ttl = segmented_pdu->ctl_ttl;
incoming_access_decrypted->seq = segmented_pdu->seq;
incoming_access_decrypted->src = segmented_pdu->src;
incoming_access_decrypted->dst = segmented_pdu->dst;
incoming_control_pdu->ivi_nid = segmented_pdu->ivi_nid;
incoming_control_pdu->ctl_ttl = segmented_pdu->ctl_ttl;
incoming_control_pdu->seq = segmented_pdu->seq;
incoming_control_pdu->src = segmented_pdu->src;
incoming_control_pdu->dst = segmented_pdu->dst;
mesh_print_hex("Assembled payload", incoming_control_pdu->data, incoming_control_pdu->len);
@ -906,7 +906,7 @@ static void mesh_upper_transport_run(void){
btstack_assert(mesh_control_message_handler != NULL);
mesh_pdu_t * pdu = (mesh_pdu_t*) incoming_control_pdu;
mesh_access_message_handler(MESH_TRANSPORT_PDU_RECEIVED, MESH_TRANSPORT_STATUS_SUCCESS, pdu);
mesh_control_message_handler(MESH_TRANSPORT_PDU_RECEIVED, MESH_TRANSPORT_STATUS_SUCCESS, pdu);
} else {