mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-28 18:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: replace network_header in mesh_control_pdu_t by individual fields

Browse Source
This commit is contained in:
Matthias Ringwald 2020-03-27 21:15:21 +01:00
parent c3fc3eea49
commit a249589839
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesh/mesh_network.h
View File

@ -238,12 +238,16 @@ typedef struct {
typedef struct {
// generic pdu header
mesh_pdu_t pdu_header;
// network header
uint8_t ivi_nid;
uint8_t ctl_ttl;
uint16_t src;
uint16_t dst;
uint32_t seq;
// meta data network layer
uint16_t netkey_index;
// akf - aid for access, opcode for control
uint8_t akf_aid_control;
// network pdu header
uint8_t network_header[9];
// MESH_TRANSPORT_FLAG
uint16_t flags;
// payload

19
src/mesh/mesh_upper_transport.c
View File

@ -763,7 +763,11 @@ static void mesh_upper_transport_run(void){
(void)memcpy(incoming_control_pdu->data, &lower_transport_pdu[1], incoming_control_pdu->len);
// copy meta data into encrypted pdu buffer
(void)memcpy(incoming_control_pdu->network_header, network_pdu->data, 9);
incoming_control_pdu->ivi_nid = network_pdu->data[0];
incoming_control_pdu->ctl_ttl = network_pdu->data[1];
incoming_control_pdu->seq = big_endian_read_24(network_pdu->data, 2);
incoming_control_pdu->src = big_endian_read_16(network_pdu->data, 5);
incoming_control_pdu->dst = big_endian_read_16(network_pdu->data, 7);
mesh_print_hex("Assembled payload", incoming_control_pdu->data, incoming_control_pdu->len);
@ -805,11 +809,15 @@ static void mesh_upper_transport_run(void){
mesh_segmented_pdu_flatten(&message_pdu->segments, 8, incoming_control_pdu->data);
// copy meta data into encrypted pdu buffer
incoming_control_pdu->len = message_pdu->len;
incoming_access_decrypted->netkey_index = message_pdu->netkey_index;
incoming_control_pdu->akf_aid_control = message_pdu->akf_aid_control;
incoming_control_pdu->flags = 0;
(void)memcpy(incoming_control_pdu->network_header, message_pdu->network_header, 9);
incoming_control_pdu->len = message_pdu->len;
incoming_control_pdu->netkey_index = message_pdu->netkey_index;
incoming_control_pdu->akf_aid_control = message_pdu->akf_aid_control;
incoming_access_decrypted->ivi_nid = message_pdu->network_header[0];
incoming_access_decrypted->ctl_ttl = message_pdu->network_header[1];
incoming_access_decrypted->seq = big_endian_read_24(message_pdu->network_header, 2);
incoming_access_decrypted->src = big_endian_read_16(message_pdu->network_header, 5);
incoming_access_decrypted->dst = big_endian_read_16(message_pdu->network_header, 7);
mesh_print_hex("Assembled payload", incoming_control_pdu->data, incoming_control_pdu->len);
@ -835,7 +843,6 @@ static void mesh_upper_transport_run(void){
incoming_access_decrypted->seq = big_endian_read_24(message_pdu->network_header, 2);
incoming_access_decrypted->src = big_endian_read_16(message_pdu->network_header, 5);
incoming_access_decrypted->dst = big_endian_read_16(message_pdu->network_header, 7);
// (void)memcpy(incoming_access_decrypted->network_header, message_pdu->network_header, 9);
mesh_upper_transport_process_access_message();
}