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

mesh: wrap unsegmented access message into mesh_message_pdu_t before passing to access layer

Browse Source
This commit is contained in:
Matthias Ringwald 2020-03-11 17:28:15 +01:00
parent c2b4731e27
commit aaa248aa80
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mesh/mesh_upper_transport.c
View File

@ -142,6 +142,7 @@ static mesh_network_pdu_t * incoming_network_pdu_decoded;
static mesh_transport_pdu_t incoming_transport_pdu_singleton;
static mesh_transport_pdu_t * incoming_transport_pdu_raw;
static mesh_transport_pdu_t * incoming_transport_pdu_decoded;
static mesh_message_pdu_t incoming_message_pdu_singleton;
static uint8_t application_nonce[13];
static btstack_crypto_ccm_t ccm;
static mesh_transport_key_and_virtual_address_iterator_t mesh_transport_key_it;
@ -204,6 +205,21 @@ static void mesh_upper_unsegmented_control_message_received(mesh_network_pdu_t *
}
}
static void mesh_upper_transport_process_message_done(mesh_message_pdu_t *message_pdu){
crypto_active = 0;
btstack_assert(message_pdu == &incoming_message_pdu_singleton);
mesh_network_pdu_t * network_pdu = (mesh_network_pdu_t *) btstack_linked_list_pop(&incoming_message_pdu_singleton.segments);
if (mesh_network_control(network_pdu)) {
btstack_assert(0);
} else {
btstack_assert(network_pdu != NULL);
mesh_network_pdu_free(network_pdu);
mesh_lower_transport_message_processed_by_higher_layer((mesh_pdu_t *) incoming_network_pdu_raw);
incoming_network_pdu_raw = NULL;
}
mesh_upper_transport_run();
}
static void mesh_upper_transport_process_unsegmented_message_done(mesh_network_pdu_t *network_pdu){
crypto_active = 0;
if (mesh_network_control(network_pdu)) {
@ -306,7 +322,7 @@ static void mesh_upper_transport_validate_unsegmented_message_ccm(void * arg){
if (mesh_access_message_handler){
mesh_pdu_t * pdu = (mesh_pdu_t*) incoming_network_pdu_decoded;
incoming_network_pdu_decoded = NULL;
mesh_access_message_handler(pdu);
mesh_access_message_handler((mesh_pdu_t*) &incoming_message_pdu_singleton);
} else {
printf("[!] Unhandled Unsegmented Access message\n");
// done
@ -386,6 +402,9 @@ void mesh_upper_transport_message_processed_by_higher_layer(mesh_pdu_t * pdu){
case MESH_PDU_TYPE_TRANSPORT:
mesh_upper_transport_process_segmented_message_done((mesh_transport_pdu_t *) pdu);
break;
case MESH_PDU_TYPE_MESSAGE:
mesh_upper_transport_process_message_done((mesh_message_pdu_t *) pdu);
break;
default:
break;
}
@ -428,6 +447,7 @@ static void mesh_upper_transport_validate_unsegmented_message(void){
// store application / device key index
mesh_print_hex("AppOrDevKey", message_key->key, 16);
incoming_network_pdu_decoded->appkey_index = message_key->appkey_index;
incoming_message_pdu_singleton.appkey_index = message_key->appkey_index;
// unsegmented message have TransMIC of 32 bit
uint8_t trans_mic_len = 4;
@ -1001,9 +1021,13 @@ static void mesh_upper_transport_run(void){
} else {
incoming_network_pdu_decoded = mesh_network_pdu_get();
if (!incoming_network_pdu_decoded) return;
// get encoded network pdu and start processing
incoming_network_pdu_raw = network_pdu;
(void) btstack_linked_list_pop(&upper_transport_incoming);
incoming_network_pdu_raw = network_pdu;
// use pre-allocated message pdu
incoming_message_pdu_singleton.pdu_header.pdu_type = MESH_PDU_TYPE_MESSAGE;
btstack_linked_list_add(&incoming_message_pdu_singleton.segments, (btstack_linked_item_t *) incoming_network_pdu_decoded);
mesh_upper_transport_process_unsegmented_access_message();
}
break;

10
test/mesh/mesh_message_test.cpp
View File

@ -5,6 +5,7 @@
#include "bluetooth_data_types.h"
#include "bluetooth_gatt.h"
#include "btstack_debug.h"
#include "btstack_memory.h"
#include "btstack_util.h"
#include "mesh/adv_bearer.h"
@ -256,6 +257,7 @@ static void test_proxy_server_callback_handler(mesh_network_callback_type_t call
static void test_upper_transport_access_message_handler(mesh_pdu_t * pdu){
mesh_transport_pdu_t * transport_pdu;
mesh_network_pdu_t * network_pdu;
mesh_message_pdu_t * message_pdu;
switch(pdu->pdu_type){
case MESH_PDU_TYPE_TRANSPORT:
transport_pdu = (mesh_transport_pdu_t *) pdu;
@ -265,8 +267,12 @@ static void test_upper_transport_access_message_handler(mesh_pdu_t * pdu){
mesh_upper_transport_message_processed_by_higher_layer(pdu);
break;
case MESH_PDU_TYPE_NETWORK:
network_pdu = (mesh_network_pdu_t *) pdu;
printf("test MESH_ACCESS_NETWORK_PDU_RECEIVED\n");
btstack_assert(0);
break;
case MESH_PDU_TYPE_MESSAGE:
message_pdu = (mesh_message_pdu_t *) pdu;
printf("test MESH_PDU_TYPE_MESSAGE\n");
network_pdu = (mesh_network_pdu_t *) btstack_linked_list_get_first_item(&message_pdu->segments);
recv_upper_transport_pdu_len = mesh_network_pdu_len(network_pdu) - 1;
memcpy(recv_upper_transport_pdu_data, mesh_network_pdu_data(network_pdu) + 1, recv_upper_transport_pdu_len);
mesh_upper_transport_message_processed_by_higher_layer(pdu);