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

mesh: remove network pdus from network_pdus_outgoing only if responsible bearer is ready

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-19 22:19:50 +02:00
parent 0694a632a5
commit bffb1c956a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mesh/mesh_network.c
View File

@ -640,33 +640,46 @@ static void process_network_pdu(mesh_network_pdu_t * network_pdu){
static void mesh_network_run(void){ static void mesh_network_run(void){
if (!btstack_linked_list_empty(&network_pdus_outgoing)){ if (!btstack_linked_list_empty(&network_pdus_outgoing)){
mesh_network_pdu_t * network_pdu = (mesh_network_pdu_t *) btstack_linked_list_pop(&network_pdus_outgoing); // peek at element
mesh_network_pdu_t * network_pdu = (mesh_network_pdu_t *) btstack_linked_list_get_first_item(&network_pdus_outgoing);
printf("mesh_network_run: pdu %p, proxy %u, con handle %4x, num packets %u\n", network_pdu, mesh_foundation_gatt_proxy_get(), gatt_bearer_con_handle, btstack_linked_list_count(&network_pdus_outgoing));
#ifdef ENABLE_MESH_GATT_BEARER #ifdef ENABLE_MESH_GATT_BEARER
// request to send via gatt if: // request to send via gatt if:
// proxy ready
// proxy active and connected // proxy active and connected
// packet wasn't received via gatt bearer // packet wasn't received via gatt bearer
printf("mesh_network_run: pdu %p, proxy %u, con handle %4x\n", network_pdu, mesh_foundation_gatt_proxy_get(), gatt_bearer_con_handle);
if (network_pdu != NULL && if (network_pdu != NULL &&
(mesh_foundation_gatt_proxy_get() != 0) && (mesh_foundation_gatt_proxy_get() != 0) &&
(gatt_bearer_con_handle != HCI_CON_HANDLE_INVALID) && (gatt_bearer_con_handle != HCI_CON_HANDLE_INVALID) &&
((network_pdu->flags & MESH_NETWORK_PDU_FLAGS_GATT_BEARER) == 0) ((network_pdu->flags & MESH_NETWORK_PDU_FLAGS_GATT_BEARER) == 0)
){ ){
gatt_bearer_network_pdu = network_pdu; // ready for gatt bearer, gatt bearer ready, too?
if (gatt_bearer_network_pdu == NULL){
(void) btstack_linked_list_pop(&network_pdus_outgoing);
gatt_bearer_network_pdu = network_pdu;
gatt_bearer_request_can_send_now_for_network_pdu();
}
network_pdu = NULL; network_pdu = NULL;
gatt_bearer_request_can_send_now_for_network_pdu();
} }
#endif #endif
#ifdef ENABLE_MESH_ADV_BEARER #ifdef ENABLE_MESH_ADV_BEARER
// request to send via adv // request to send via adv if:
// adv bearer ready
if (network_pdu != NULL){ if (network_pdu != NULL){
adv_bearer_network_pdu = network_pdu; // ready for adv bearer, adv ready, too?
if (adv_bearer_network_pdu == NULL){
(void) btstack_linked_list_pop(&network_pdus_outgoing);
adv_bearer_network_pdu = network_pdu;
adv_bearer_request_can_send_now_for_network_pdu();
}
network_pdu = NULL; network_pdu = NULL;
adv_bearer_request_can_send_now_for_network_pdu();
} }
#endif #endif
if (network_pdu != NULL){ if (network_pdu != NULL){
// notify upper layer // notify upper layer
(void) btstack_linked_list_pop(&network_pdus_outgoing);
(*mesh_network_higher_layer_handler)(MESH_NETWORK_PDU_SENT, network_pdu); (*mesh_network_higher_layer_handler)(MESH_NETWORK_PDU_SENT, network_pdu);
} }
} }