diff options
| author | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-01-10 23:53:50 +0000 |
|---|---|---|
| committer | Ryan Thomas McBride <mcbride@cvs.openbsd.org> | 2005-01-10 23:53:50 +0000 |
| commit | ca6f4dedf7deebc0146f43142008b43fa50903a4 (patch) | |
| tree | 9332686e1751a4754bb55b4e3610c0f01279a46e /sys/netinet/tcp_subr.c | |
| parent | cea4da524a79850924b7b29f5df029661c360a26 (diff) | |
Make sure bogus values don't make their way into tcp_xmit_timer() calculations.
- Ignore ts_ecr if it is 0, or the resulting rtt is out of range.
(use tp->t_rtttime instead)
- Initialise tcp_now to 1, to avoid the 500ms window where a valid ts_ecr
of 0 could be ignored.
- Convert out-of-range rtt values to valid ones in tcp_xmit_timer().
ok frantzen@ markus@
Diffstat (limited to 'sys/netinet/tcp_subr.c')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 5a9945f3fb7..28157fa463c 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.85 2004/11/25 15:32:08 markus Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.86 2005/01/10 23:53:49 mcbride Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -133,7 +133,7 @@ int tcp_ack_on_push = 0; /* set to enable immediate ACK-on-PUSH */ int tcp_do_ecn = 0; /* RFC3168 ECN enabled/disabled? */ int tcp_do_rfc3390 = 0; /* RFC3390 Increasing TCP's Initial Window */ -u_int32_t tcp_now; +u_int32_t tcp_now = 1; #ifndef TCBHASHSIZE #define TCBHASHSIZE 128 |