mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed removing unneeded TCP SACKs

Browse Source 
TCP SACKs were removed after some changes in the ooseq queue,
but before all unneeded packets were removed from it.
Because of that, we would sometimes include SACKs
for data already delivered in-order.

Signed-off-by: goldsimon <goldsimon@gmx.de>
This commit is contained in:
Jakub Schmidtke 2017-09-08 16:06:49 -04:00 committed by goldsimon
parent 86abfbe087
commit b7e5de389e
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/tcp_in.c
View File

@ -1501,19 +1501,6 @@ tcp_receive(struct tcp_pcb *pcb)
} }
pcb->ooseq = next; pcb->ooseq = next;
} }
#if LWIP_TCP_SACK_OUT
if (pcb->flags & TF_SACK) {
if (pcb->ooseq != NULL) {
/* Some segments may have been removed from ooseq, let's remove all SACKs that
describe anything before the new beginning of that list. */
tcp_remove_sacks_lt(pcb, pcb->ooseq->tcphdr->seqno);
} else {
/* ooseq has been cleared. Nothing to SACK */
memset(pcb->rcv_sacks, 0, sizeof(pcb->rcv_sacks));
}
}
#endif /* LWIP_TCP_SACK_OUT */
} }
#endif /* TCP_QUEUE_OOSEQ */ #endif /* TCP_QUEUE_OOSEQ */
@ -1586,6 +1573,18 @@ tcp_receive(struct tcp_pcb *pcb)
pcb->ooseq = cseg->next; pcb->ooseq = cseg->next;
tcp_seg_free(cseg); tcp_seg_free(cseg);
} }
#if LWIP_TCP_SACK_OUT
if (pcb->flags & TF_SACK) {
if (pcb->ooseq != NULL) {
/* Some segments may have been removed from ooseq, let's remove all SACKs that
describe anything before the new beginning of that list. */
tcp_remove_sacks_lt(pcb, pcb->ooseq->tcphdr->seqno);
} else if (LWIP_TCP_SACK_VALID(pcb, 0)) {
/* ooseq has been cleared. Nothing to SACK */
memset(pcb->rcv_sacks, 0, sizeof(pcb->rcv_sacks));
}
}
#endif /* LWIP_TCP_SACK_OUT */
#endif /* TCP_QUEUE_OOSEQ */ #endif /* TCP_QUEUE_OOSEQ */