Relax a KASSERT condition to allow for a valid corner case where
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:
parent
75fba44b93
commit
89c02376fc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=126220
@ -1917,6 +1917,7 @@ tcp_input(m, off0)
|
||||
u_long oldcwnd = tp->snd_cwnd;
|
||||
tcp_seq oldsndmax = tp->snd_max;
|
||||
u_int sent;
|
||||
|
||||
KASSERT(tp->t_dupacks == 1 ||
|
||||
tp->t_dupacks == 2,
|
||||
("dupacks not 1 or 2"));
|
||||
@ -1929,8 +1930,10 @@ tcp_input(m, off0)
|
||||
(void) tcp_output(tp);
|
||||
sent = tp->snd_max - oldsndmax;
|
||||
if (sent > tp->t_maxseg) {
|
||||
KASSERT(tp->snd_limited == 0 &&
|
||||
tp->t_dupacks == 2,
|
||||
KASSERT((tp->t_dupacks == 2 &&
|
||||
tp->snd_limited == 0) ||
|
||||
(sent == tp->t_maxseg + 1 &&
|
||||
tp->t_flags & TF_SENTFIN),
|
||||
("sent too much"));
|
||||
tp->snd_limited = 2;
|
||||
} else if (sent > 0)
|
||||
|
@ -1917,6 +1917,7 @@ tcp_input(m, off0)
|
||||
u_long oldcwnd = tp->snd_cwnd;
|
||||
tcp_seq oldsndmax = tp->snd_max;
|
||||
u_int sent;
|
||||
|
||||
KASSERT(tp->t_dupacks == 1 ||
|
||||
tp->t_dupacks == 2,
|
||||
("dupacks not 1 or 2"));
|
||||
@ -1929,8 +1930,10 @@ tcp_input(m, off0)
|
||||
(void) tcp_output(tp);
|
||||
sent = tp->snd_max - oldsndmax;
|
||||
if (sent > tp->t_maxseg) {
|
||||
KASSERT(tp->snd_limited == 0 &&
|
||||
tp->t_dupacks == 2,
|
||||
KASSERT((tp->t_dupacks == 2 &&
|
||||
tp->snd_limited == 0) ||
|
||||
(sent == tp->t_maxseg + 1 &&
|
||||
tp->t_flags & TF_SENTFIN),
|
||||
("sent too much"));
|
||||
tp->snd_limited = 2;
|
||||
} else if (sent > 0)
|
||||
|
Loading…
Reference in New Issue
Block a user