abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-05-31 06:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

tcp: fix RTO timer not working if link is down

Browse Source 
... and added some test cases for this situation
See bug #54139

Signed-off-by: Simon Goldschmidt <goldsimon@gmx.de>
This commit is contained in:
Simon Goldschmidt
2018-06-19 22:48:06 +02:00
parent 3cdfc67dd8
commit 824ebbe0e9
2 changed files with 164 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/tcp.c
View File

@@ -1266,16 +1266,19 @@ tcp_slowtmr_start:
}
} else {
/* Increase the retransmission timer if it is running */
if (pcb->rtime >= 0) {
if ((pcb->rtime >= 0) && (pcb->rtime < 0x7FFF)) {
++pcb->rtime;
}
if (pcb->unacked != NULL && pcb->rtime >= pcb->rto) {
if (pcb->rtime >= pcb->rto) {
/* Time for a retransmission. */
LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_slowtmr: rtime %"S16_F
" pcb->rto %"S16_F"\n",
pcb->rtime, pcb->rto));
if (tcp_rexmit_rto_prepare(pcb) == ERR_OK) {
/* If prepare phase fails but we have unsent data but no unacked data,
still execute the backoff calculations below, as this means we somehow
failed to send segment. */
if ((tcp_rexmit_rto_prepare(pcb) == ERR_OK) || ((pcb->unacked == NULL) && (pcb->unsent != NULL))) {
/* Double retransmission time-out unless we are trying to
* connect to somebody (i.e., we are in SYN_SENT). */
if (pcb->state != SYN_SENT) {