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

mesh: use outgoing_segmented_pdu as guard in upper transport

Browse Source
This commit is contained in:
Matthias Ringwald 2020-03-17 17:42:38 +01:00
parent 12ba52abb7
commit 536fc3830d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesh/mesh_upper_transport.c
View File

@ -92,6 +92,8 @@ static mesh_access_pdu_t incoming_access_pdu_decrypted_singleton;
static mesh_message_pdu_t outgoing_segmented_message_singleton; static mesh_message_pdu_t outgoing_segmented_message_singleton;
static mesh_transport_pdu_t * outgoing_segmented_pdu;
static uint8_t application_nonce[13]; static uint8_t application_nonce[13];
static btstack_crypto_ccm_t ccm; static btstack_crypto_ccm_t ccm;
static mesh_transport_key_and_virtual_address_iterator_t mesh_transport_key_it; static mesh_transport_key_and_virtual_address_iterator_t mesh_transport_key_it;
@ -603,6 +605,8 @@ static void mesh_upper_transport_pdu_handler(mesh_transport_callback_type_t call
mesh_upper_transport_message_received(pdu); mesh_upper_transport_message_received(pdu);
break; break;
case MESH_TRANSPORT_PDU_SENT: case MESH_TRANSPORT_PDU_SENT:
// clear flag
outgoing_segmented_pdu = NULL;
// notify upper layer (or just free pdu) // notify upper layer (or just free pdu)
if (higher_layer_handler){ if (higher_layer_handler){
higher_layer_handler(callback_type, status, pdu); higher_layer_handler(callback_type, status, pdu);
@ -635,6 +639,7 @@ static void mesh_upper_transport_send_unsegmented_access_pdu_ccm(void * arg){
} }
static void mesh_upper_transport_send_segmented_pdu(mesh_transport_pdu_t * transport_pdu){ static void mesh_upper_transport_send_segmented_pdu(mesh_transport_pdu_t * transport_pdu){
outgoing_segmented_pdu = transport_pdu;
mesh_lower_transport_send_pdu((mesh_pdu_t*) transport_pdu); mesh_lower_transport_send_pdu((mesh_pdu_t*) transport_pdu);
} }
@ -1114,6 +1119,8 @@ static void mesh_upper_transport_run(void){
if (crypto_active) break; if (crypto_active) break;
if (outgoing_segmented_pdu != NULL) break;
mesh_pdu_t * pdu = (mesh_pdu_t *) btstack_linked_list_get_first_item(&upper_transport_outgoing); mesh_pdu_t * pdu = (mesh_pdu_t *) btstack_linked_list_get_first_item(&upper_transport_outgoing);
if (mesh_lower_transport_can_send_to_dest(mesh_pdu_dst(pdu)) == 0) break; if (mesh_lower_transport_can_send_to_dest(mesh_pdu_dst(pdu)) == 0) break;