aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMike Silbersack <silby@FreeBSD.org>2007-11-20 06:56:04 +0000
committerMike Silbersack <silby@FreeBSD.org>2007-11-20 06:56:04 +0000
commit1b67beea1343270e729c7049dfd4c6892a6304c3 (patch)
tree6c49e2354691f160a707b21e74f71a2579cae92a /sys
parentcfd540e7db26057578e7b34634a975a960442d72 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/tcp_syncache.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 738d8e7ba6c85..0ff86323bc683 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -887,10 +887,15 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
"rejected\n", s, __func__, th->th_seq, sc->sc_irs);
goto failed;
}
+#if 0
/*
* If timestamps were present in the SYN and we accepted
* them in our SYN|ACK we require them to be present from
* now on. And vice versa.
+ *
+ * Unfortunately, during testing of 7.0 some users found
+ * network devices that violate this constraint, so it must
+ * be disabled.
*/
if ((sc->sc_flags & SCF_TIMESTAMP) && !(to->to_flags & TOF_TS)) {
if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
@@ -898,6 +903,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th,
"segment rejected\n", s, __func__);
goto failed;
}
+#endif
if (!(sc->sc_flags & SCF_TIMESTAMP) && (to->to_flags & TOF_TS)) {
if ((s = tcp_log_addrs(inc, th, NULL, NULL)))
log(LOG_DEBUG, "%s; %s: Timestamp not expected, "