github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-20 05:23:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sending Cumulative DATA ACK

Browse source
This commit is contained in:
Florian Märkl 2019-08-26 13:25:13 +02:00 • committed by Florian Märkl
commit 9e1faf1347
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/src/takion.c
View file

@ -901,12 +901,15 @@ static void takion_handle_packet_message(ChiakiTakion *takion, uint8_t *buf, siz
static void takion_flush_data_queue(ChiakiTakion *takion) static void takion_flush_data_queue(ChiakiTakion *takion)
{ {
uint64_t seq_num = 0;
bool ack = false;
while(true) while(true)
{ {
TakionDataPacketEntry *entry; TakionDataPacketEntry *entry;
bool pulled = chiaki_reorder_queue_pull(&takion->data_queue, NULL, (void **)&entry); bool pulled = chiaki_reorder_queue_pull(&takion->data_queue, &seq_num, (void **)&entry);
if(!pulled) if(!pulled)
break; break;
ack = true;
if(entry->payload_size < 9) if(entry->payload_size < 9)
{ {
@ -939,6 +942,9 @@ static void takion_flush_data_queue(ChiakiTakion *takion)
free(entry->packet_buf); free(entry->packet_buf);
free(entry); free(entry);
} }
if(ack)
chiaki_takion_send_message_data_ack(takion, (uint32_t)seq_num);
} }
static void takion_handle_packet_message_data(ChiakiTakion *takion, uint8_t *packet_buf, size_t packet_buf_size, uint8_t type_b, uint8_t *payload, size_t payload_size) static void takion_handle_packet_message_data(ChiakiTakion *takion, uint8_t *packet_buf, size_t packet_buf_size, uint8_t type_b, uint8_t *payload, size_t payload_size)
@ -964,7 +970,6 @@ static void takion_handle_packet_message_data(ChiakiTakion *takion, uint8_t *pac
entry->channel = ntohs(*((uint16_t *)(payload + 4))); entry->channel = ntohs(*((uint16_t *)(payload + 4)));
ChiakiSeqNum32 seq_num = ntohl(*((uint32_t *)(payload + 0))); ChiakiSeqNum32 seq_num = ntohl(*((uint32_t *)(payload + 0)));
chiaki_takion_send_message_data_ack(takion, seq_num);
chiaki_reorder_queue_push(&takion->data_queue, seq_num, entry); chiaki_reorder_queue_push(&takion->data_queue, seq_num, entry);
takion_flush_data_queue(takion); takion_flush_data_queue(takion);
} }