d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relax a KASSERT condition to allow for a valid corner case where

Browse Source 
the FIN on the last segment consumes an extra sequence number.

Spurious panic reported by Mike Silbersack <silby@silby.com>.
This commit is contained in:
Jeffrey Hsu 2004-02-25 08:53:17 +00:00
parent 75fba44b93
commit 89c02376fc
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/netinet/tcp_input.c
View File

@ -1917,6 +1917,7 @@ tcp_input(m, off0)
u_long oldcwnd = tp->snd_cwnd; u_long oldcwnd = tp->snd_cwnd;
tcp_seq oldsndmax = tp->snd_max; tcp_seq oldsndmax = tp->snd_max;
u_int sent; u_int sent;
KASSERT(tp->t_dupacks == 1 || KASSERT(tp->t_dupacks == 1 ||
tp->t_dupacks == 2, tp->t_dupacks == 2,
("dupacks not 1 or 2")); ("dupacks not 1 or 2"));
@ -1929,8 +1930,10 @@ tcp_input(m, off0)
(void) tcp_output(tp); (void) tcp_output(tp);
sent = tp->snd_max - oldsndmax; sent = tp->snd_max - oldsndmax;
if (sent > tp->t_maxseg) { if (sent > tp->t_maxseg) {
KASSERT(tp->snd_limited == 0 && KASSERT((tp->t_dupacks == 2 &&
tp->t_dupacks == 2, tp->snd_limited == 0) ||
(sent == tp->t_maxseg + 1 &&
tp->t_flags & TF_SENTFIN),
("sent too much")); ("sent too much"));
tp->snd_limited = 2; tp->snd_limited = 2;
} else if (sent > 0) } else if (sent > 0)

7
sys/netinet/tcp_reass.c
View File

@ -1917,6 +1917,7 @@ tcp_input(m, off0)
u_long oldcwnd = tp->snd_cwnd; u_long oldcwnd = tp->snd_cwnd;
tcp_seq oldsndmax = tp->snd_max; tcp_seq oldsndmax = tp->snd_max;
u_int sent; u_int sent;
KASSERT(tp->t_dupacks == 1 || KASSERT(tp->t_dupacks == 1 ||
tp->t_dupacks == 2, tp->t_dupacks == 2,
("dupacks not 1 or 2")); ("dupacks not 1 or 2"));
@ -1929,8 +1930,10 @@ tcp_input(m, off0)
(void) tcp_output(tp); (void) tcp_output(tp);
sent = tp->snd_max - oldsndmax; sent = tp->snd_max - oldsndmax;
if (sent > tp->t_maxseg) { if (sent > tp->t_maxseg) {
KASSERT(tp->snd_limited == 0 && KASSERT((tp->t_dupacks == 2 &&
tp->t_dupacks == 2, tp->snd_limited == 0) ||
(sent == tp->t_maxseg + 1 &&
tp->t_flags & TF_SENTFIN),
("sent too much")); ("sent too much"));
tp->snd_limited = 2; tp->snd_limited = 2;
} else if (sent > 0) } else if (sent > 0)