diff options
| author | Paul Saab <ps@FreeBSD.org> | 2004-11-29 18:47:27 +0000 |
|---|---|---|
| committer | Paul Saab <ps@FreeBSD.org> | 2004-11-29 18:47:27 +0000 |
| commit | 7d5ed1ceea133ba4355a36907d4a5ba423728128 (patch) | |
| tree | b03e926e0c4b519d7f6db70dff5016673034a385 /sys/netinet/tcp_output.c | |
| parent | 0508c09a41d7c9d8efecd4b42c0db72eec1d84d3 (diff) | |
| download | src-7d5ed1ceea133ba4355a36907d4a5ba423728128.tar.gz src-7d5ed1ceea133ba4355a36907d4a5ba423728128.zip | |
Fixes a bug in SACK causing us to send data beyond the receive window.
Found by: Pawel Worach and Daniel Hartmeier
Submitted by: Mohan Srinivasan mohans at yahoo-inc dot com
Notes
Notes:
svn path=/head/; revision=138199
Diffstat (limited to 'sys/netinet/tcp_output.c')
| -rw-r--r-- | sys/netinet/tcp_output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 0e36553b1abe..e761acca8c55 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -310,8 +310,10 @@ after_sack_rexmit: * sending new data, having retransmitted all the * data possible in the scoreboard. */ - len = so->so_snd.sb_cc - off; - cwin = sendwin - (tp->snd_nxt - tp->sack_newdata) - + len = ((long)ulmin(so->so_snd.sb_cc, tp->snd_wnd) + - off); + cwin = tp->snd_cwnd - + (tp->snd_nxt - tp->sack_newdata) - sack_bytes_rxmt; if (cwin < 0) cwin = 0; |