mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-18 14:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: improve variable names in lower transport

Browse Source
This commit is contained in:
Matthias Ringwald 2020-03-09 15:45:12 +01:00
parent 59613427f2
commit 1e6c9225b9
1 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mesh/mesh_lower_transport.c
View File

@ -166,6 +166,9 @@ static btstack_linked_list_t lower_transport_outgoing;
static mesh_transport_pdu_t * lower_transport_outgoing_pdu; static mesh_transport_pdu_t * lower_transport_outgoing_pdu;
static mesh_network_pdu_t * lower_transport_outgoing_segment; static mesh_network_pdu_t * lower_transport_outgoing_segment;
static uint16_t lower_transport_outgoing_seg_o; static uint16_t lower_transport_outgoing_seg_o;
static mesh_message_pdu_t * lower_transport_outgoing_message;
// segment at network layer // segment at network layer
static int lower_transport_outgoing_segment_queued; static int lower_transport_outgoing_segment_queued;
// transmission timeout occured (while outgoing segment queued at network layer) // transmission timeout occured (while outgoing segment queued at network layer)
@ -749,9 +752,19 @@ static void mesh_lower_transport_segment_transmission_fired(void){
static void mesh_lower_transport_network_pdu_sent(mesh_network_pdu_t *network_pdu){ static void mesh_lower_transport_network_pdu_sent(mesh_network_pdu_t *network_pdu){
// figure out what pdu was sent // figure out what pdu was sent
// single segment of segmented message? // single segment?
if (lower_transport_outgoing_segment == network_pdu){ if (lower_transport_outgoing_segment == network_pdu){
if (lower_transport_outgoing_message != NULL){
// of unsegmented message
mesh_message_pdu_t * message_pdu = lower_transport_outgoing_message;
lower_transport_outgoing_message = NULL;
lower_transport_outgoing_segment = NULL;
higher_layer_handler(MESH_TRANSPORT_PDU_SENT, MESH_TRANSPORT_STATUS_SUCCESS, (mesh_pdu_t *) message_pdu);
return;
} else {
// of segmented message
#ifdef LOG_LOWER_TRANSPORT #ifdef LOG_LOWER_TRANSPORT
printf("[+] Lower transport, segmented pdu %p, seq %06x: network pdu %p sent\n", lower_transport_outgoing_pdu, mesh_transport_seq(lower_transport_outgoing_pdu), network_pdu); printf("[+] Lower transport, segmented pdu %p, seq %06x: network pdu %p sent\n", lower_transport_outgoing_pdu, mesh_transport_seq(lower_transport_outgoing_pdu), network_pdu);
#endif #endif
@ -773,6 +786,7 @@ static void mesh_lower_transport_network_pdu_sent(mesh_network_pdu_t *network_pd
// send next segment // send next segment
mesh_lower_transport_send_next_segment(); mesh_lower_transport_send_next_segment();
}
return; return;
} }
@ -859,17 +873,26 @@ static void mesh_lower_transport_run(void){
// check if outgoing segmented pdu is active // check if outgoing segmented pdu is active
if (lower_transport_outgoing_pdu) return; if (lower_transport_outgoing_pdu) return;
if (lower_transport_outgoing_message) return;
while(!btstack_linked_list_empty(&lower_transport_outgoing)) { while(!btstack_linked_list_empty(&lower_transport_outgoing)) {
// get next message // get next message
mesh_transport_pdu_t * transport_pdu; mesh_transport_pdu_t * transport_pdu;
mesh_network_pdu_t * network_pdu; mesh_network_pdu_t * network_pdu;
mesh_message_pdu_t * message_pdu;
mesh_pdu_t * pdu = (mesh_pdu_t *) btstack_linked_list_pop(&lower_transport_outgoing); mesh_pdu_t * pdu = (mesh_pdu_t *) btstack_linked_list_pop(&lower_transport_outgoing);
switch (pdu->pdu_type) { switch (pdu->pdu_type) {
case MESH_PDU_TYPE_NETWORK: case MESH_PDU_TYPE_NETWORK:
network_pdu = (mesh_network_pdu_t *) pdu; network_pdu = (mesh_network_pdu_t *) pdu;
mesh_network_send_pdu(network_pdu); mesh_network_send_pdu(network_pdu);
break; break;
case MESH_PDU_TYPE_MESSAGE:
message_pdu = (mesh_message_pdu_t *) pdu;
network_pdu = (mesh_network_pdu_t *) btstack_linked_list_get_first_item(&message_pdu->segments);
lower_transport_outgoing_message = message_pdu;
lower_transport_outgoing_segment = network_pdu;
mesh_network_send_pdu(network_pdu);
break;
case MESH_PDU_TYPE_TRANSPORT: case MESH_PDU_TYPE_TRANSPORT:
transport_pdu = (mesh_transport_pdu_t *) pdu; transport_pdu = (mesh_transport_pdu_t *) pdu;
printf("[+] Lower transport, segmented pdu %p, seq %06x: run start sending now\n", transport_pdu, mesh_transport_seq(transport_pdu)); printf("[+] Lower transport, segmented pdu %p, seq %06x: run start sending now\n", transport_pdu, mesh_transport_seq(transport_pdu));