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

mesh: extract stop ack/incomplete timer

Browse Source
This commit is contained in:
Matthias Ringwald 2019-01-16 13:41:45 +01:00
parent 62b75e2f6e
commit f529f52e08
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
test/mesh/mesh_transport.c
View File

@ -223,6 +223,7 @@ static int mesh_seq_auth_validate(uint16_t src, uint32_t seq){
static void mesh_lower_transport_run(void);
static void mesh_upper_transport_validate_unsegmented_message(mesh_network_pdu_t * network_pdu);
static void mesh_upper_transport_validate_segmented_message(mesh_transport_pdu_t * transport_pdu);
static void mesh_transport_abort_transmission(void);
static int mesh_transport_crypto_active;
static mesh_network_pdu_t * network_pdu_in_validation;
@ -326,21 +327,6 @@ static void mesh_transport_set_dest(mesh_transport_pdu_t * transport_pdu, uint16
big_endian_store_16(transport_pdu->network_header, 7, dest);
}
// abort outgoing transmission
static void mesh_transport_abort_transmission(void){
// stop timers
upper_transport_outgoing_pdu->acknowledgement_timer_active = 0;
upper_transport_outgoing_pdu->incomplete_timer_active = 0;
btstack_run_loop_remove_timer(&upper_transport_outgoing_pdu->acknowledgement_timer);
btstack_run_loop_remove_timer(&upper_transport_outgoing_pdu->incomplete_timer);
// free pdus
btstack_memory_mesh_transport_pdu_free(upper_transport_outgoing_pdu);
upper_transport_outgoing_pdu = NULL;
btstack_memory_mesh_network_pdu_free(upper_transport_outgoing_segment);
upper_transport_outgoing_segment = NULL;
}
static void mesh_transport_process_unsegmented_control_message(mesh_network_pdu_t * network_pdu){
uint8_t * lower_transport_pdu = mesh_network_pdu_data(network_pdu);
uint8_t opcode = lower_transport_pdu[0];
@ -682,16 +668,6 @@ static void mesh_transport_rx_incomplete_timeout(btstack_timer_source_t * ts){
test_transport_pdu = NULL;
}
static void mesh_network_segmented_message_complete(mesh_transport_pdu_t * transport_pdu){
// stop timers
transport_pdu->acknowledgement_timer_active = 0;
transport_pdu->incomplete_timer_active = 0;
btstack_run_loop_remove_timer(&transport_pdu->acknowledgement_timer);
btstack_run_loop_remove_timer(&transport_pdu->incomplete_timer);
// send ack
mesh_transport_send_ack(transport_pdu);
}
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);
@ -701,6 +677,12 @@ static void mesh_transport_start_acknowledgment_timer(mesh_transport_pdu_t * tra
transport_pdu->acknowledgement_timer_active = 1;
}
static void mesh_transport_stop_acknowledgment_timer(mesh_transport_pdu_t * transport_pdu){
if (!transport_pdu->acknowledgement_timer_active) return;
transport_pdu->acknowledgement_timer_active = 0;
btstack_run_loop_remove_timer(&transport_pdu->acknowledgement_timer);
}
static void mesh_transport_restart_incomplete_timer(mesh_transport_pdu_t * transport_pdu, uint32_t timeout, void (*callback)(btstack_timer_source_t * ts)){
if (transport_pdu->incomplete_timer_active){
btstack_run_loop_remove_timer(&transport_pdu->incomplete_timer);
@ -711,6 +693,31 @@ static void mesh_transport_restart_incomplete_timer(mesh_transport_pdu_t * trans
btstack_run_loop_add_timer(&transport_pdu->incomplete_timer);
}
static void mesh_transport_stop_incomplete_timer(mesh_transport_pdu_t * transport_pdu){
if (!transport_pdu->incomplete_timer_active) return;
transport_pdu->incomplete_timer_active = 0;
btstack_run_loop_remove_timer(&transport_pdu->incomplete_timer);
}
static void mesh_network_segmented_message_complete(mesh_transport_pdu_t * transport_pdu){
// stop timers
mesh_transport_stop_acknowledgment_timer(transport_pdu);
mesh_transport_stop_incomplete_timer(transport_pdu);
// send ack
mesh_transport_send_ack(transport_pdu);
}
// abort outgoing transmission
static void mesh_transport_abort_transmission(void){
// stop ack timers
mesh_transport_stop_acknowledgment_timer(upper_transport_outgoing_pdu);
// free pdus
btstack_memory_mesh_transport_pdu_free(upper_transport_outgoing_pdu);
upper_transport_outgoing_pdu = NULL;
btstack_memory_mesh_network_pdu_free(upper_transport_outgoing_segment);
upper_transport_outgoing_segment = NULL;
}
static mesh_transport_pdu_t * mesh_transport_pdu_for_segmented_message(mesh_network_pdu_t * network_pdu){
// uint16_t src = mesh_network_src(next_pdu);
if (test_transport_pdu == NULL){