summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_timer.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2007-06-15 18:23:08 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2007-06-15 18:23:08 +0000
commitf436c78cb6491d8683072efdb5f8859e0f47fbc2 (patch)
tree047d89a7652636c7822d9e6028689289e70bcbf7 /sys/netinet/tcp_timer.c
parent0bc06951a0d06a0401b4b4079f71d9299e8449b5 (diff)
Drop the current random timestamps and the current ISN generation
code and replace both with a RFC1948 based method, so TCP clients now have monotonic ISN/timestamps. The server side uses completely random ISN/timestamps and does time-wait recycling (on port reuse). ok djm@, mcbride@; thanks to lots of testers
Diffstat (limited to 'sys/netinet/tcp_timer.c')
-rw-r--r--sys/netinet/tcp_timer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 7265e503970..e3add336a5a 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_timer.c,v 1.38 2005/11/15 21:09:46 miod Exp $ */
+/* $OpenBSD: tcp_timer.c,v 1.39 2007/06/15 18:23:07 markus Exp $ */
/* $NetBSD: tcp_timer.c,v 1.14 1996/02/13 23:44:09 christos Exp $ */
/*
@@ -138,6 +138,8 @@ tcp_slowtimo()
tcp_iss += TCP_ISSINCR/PR_SLOWHZ; /* increment iss */
if ((int)tcp_iss < 0)
tcp_iss = 0; /* XXX */
+#else
+ tcp_iss += TCP_ISSINCR2/PR_SLOWHZ; /* increment iss */
#endif /* TCP_COMPAT_42 */
tcp_now++; /* for timestamps */
splx(s);