diff options
| author | kmacy <kmacy@FreeBSD.org> | 2007-12-12 06:11:50 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2007-12-12 06:11:50 +0000 |
| commit | a571860f4113fde184ee1da348d8f1104ce091ff (patch) | |
| tree | 31fb6fb2cb1b279e2e602d3364c56b0c8fa28a2b | |
| parent | 08536bf15543e6d8bffef1874897e7b7f7145865 (diff) | |
| download | FreeBSD-src-a571860f4113fde184ee1da348d8f1104ce091ff.zip FreeBSD-src-a571860f4113fde184ee1da348d8f1104ce091ff.tar.gz | |
Remove spurious timestamp check. RFC 1323 explicitly states that timestamps MAY
be transmitted if negotiated.
| -rw-r--r-- | sys/netinet/tcp_syncache.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index c3e2b90..e2573e1 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -890,23 +890,7 @@ 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))) - log(LOG_DEBUG, "%s; %s: Timestamp missing, " - "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, " |
