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

mesh: fix mesh_network_seq getter

Browse Source
This commit is contained in:
Matthias Ringwald 2018-11-15 16:03:33 +01:00
parent 339c5cba81
commit 1cbc4a36a7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ble/mesh/mesh_network.c
View File

@ -247,7 +247,7 @@ static void mesh_network_send_c(void *arg){
network_pdu->data[1+i] ^= obfuscation_block[i];
}
printf("NetworkPDU: ");
printf("TX-NetworkPDU: ");
printf_hexdump(network_pdu->data, network_pdu->len);
// crypto done
@ -297,7 +297,7 @@ static void mesh_network_send_0(mesh_network_pdu_t * network_pdu){
// get network nonce
mesh_network_create_nonce(network_nonce, network_pdu, global_iv_index);
printf("Nonce: ");
printf("TX-NetworkNonce: ");
printf_hexdump(network_nonce, 13);
// start ccm
@ -606,6 +606,10 @@ uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl, uint3
memcpy(&network_pdu->data[network_pdu->len], transport_pdu_data, transport_pdu_len);
network_pdu->len += transport_pdu_len;
printf("NetworkPDU(unencrypted): ");
printf_hexdump(network_pdu->data, network_pdu->len);
// queue up
btstack_linked_list_add_tail(&network_pdus_queued, (btstack_linked_item_t *) network_pdu);

6
test/mesh/mesh.c
View File

@ -417,7 +417,7 @@ static uint16_t mesh_transport_ttl(mesh_transport_pdu_t * transport_pdu){
return transport_pdu->network_header[1] & 0x7f;
}
static uint32_t mesh_transport_seq(mesh_transport_pdu_t * transport_pdu){
return big_endian_read_16(transport_pdu->network_header, 2);
return big_endian_read_24(transport_pdu->network_header, 2);
}
static uint16_t mesh_transport_src(mesh_transport_pdu_t * transport_pdu){
return big_endian_read_16(transport_pdu->network_header, 5);
@ -699,7 +699,7 @@ static void mesh_transport_send_ack(mesh_transport_pdu_t * transport_pdu){
mesh_lower_transport_setup_segemnted_acknowledge_message(ack_msg, 0, seq & 0x1fff, transport_pdu->block_ack);
printf("mesh_transport_send_ack: ");
printf("mesh_transport_send_ack with netkey_index %x: ", transport_pdu->netkey_index);
printf_hexdump(ack_msg, sizeof(ack_msg));
mesh_network_send(transport_pdu->netkey_index, mesh_transport_ctl(transport_pdu), mesh_transport_ttl(transport_pdu),
mesh_transport_seq(transport_pdu), primary_element_address, mesh_transport_src(transport_pdu),
@ -707,6 +707,7 @@ static void mesh_transport_send_ack(mesh_transport_pdu_t * transport_pdu){
}
static void mesh_transport_rx_ack_timeout(btstack_timer_source_t * ts){
printf("ACK: acknowledgement timer fired, send ACK\n");
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) btstack_run_loop_get_timer_context(ts);
transport_pdu->acknowledgement_timer_active = 0;
mesh_transport_send_ack(transport_pdu);
@ -735,6 +736,7 @@ static void mesh_network_segmented_message_complete(mesh_transport_pdu_t * trans
}
static void mesh_transport_start_acknowledgment_timer(mesh_transport_pdu_t * transport_pdu, uint32_t timeout, void (*callback)(btstack_timer_source_t * ts)){
printf("ACK: start ack timer, timeout %u ms\n", (int) timeout);
btstack_run_loop_set_timer(&transport_pdu->acknowledgement_timer, timeout);
btstack_run_loop_set_timer_handler(&transport_pdu->acknowledgement_timer, callback);
btstack_run_loop_set_timer_context(&transport_pdu->acknowledgement_timer, transport_pdu);