From add4874801befc8375e35c6ea6bb04793afee4e8 Mon Sep 17 00:00:00 2001 From: kieranm Date: Thu, 20 Dec 2007 14:58:43 +0000 Subject: [PATCH] 2007-12-20 Kieran Mansley (based on patch from Oleg Tyshev) * tcp_in.c: fix bug# 21535 (nrtx not reset correctly in SYN_SENT stat)e --- CHANGELOG | 3 +++ src/core/tcp_in.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 11b9a93f..2b1e44fb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -526,6 +526,9 @@ HISTORY ++ Bug fixes: + 2007-12-20 Kieran Mansley (based on patch from Oleg Tyshev) + * tcp_in.c: fix bug# 21535 (nrtx not reset correctly in SYN_SENT stat)e + 2007-12-20 Kieran Mansley (based on patch from Per-Henrik Lundbolm) * tcp.c, tcp_in.c, tcp_out.c, tcp.h: fix bug #20199 (better handling of silly window avoidance and prevent lwIP from shrinking the window) diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c index beffcff4..54e913ba 100644 --- a/src/core/tcp_in.c +++ b/src/core/tcp_in.c @@ -539,8 +539,10 @@ tcp_process(struct tcp_pcb *pcb) timer, otherwise reset it to start again */ if(pcb->unacked == NULL) pcb->rtime = -1; - else + else { pcb->rtime = 0; + pcb->nrtx = 0; + } tcp_seg_free(rseg);