Author: tuexen
Date: Thu Sep 10 11:45:03 2020
New Revision: 365562
URL: https://svnweb.freebsd.org/changeset/base/365562
Log:
MFC r364054:
Improve the ECN negotiation when the TCP SYN-cache is used by making
sure that
* ECN is disabled if the client sends an non-ECN-setup SYN segment.
* ECN is disabled is the ECN-setup SYN-ACK segment is retransmitted more
than net.inet.tcp.ecn.maxretries times.
Modified:
stable/12/sys/netinet/tcp_syncache.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/12/sys/netinet/tcp_syncache.c Thu Sep 10 11:43:23 2020
(r365561)
+++ stable/12/sys/netinet/tcp_syncache.c Thu Sep 10 11:45:03 2020
(r365562)
@@ -477,6 +477,9 @@ syncache_timer(void *xsch)
sch->sch_nextc = sc->sc_rxttime;
continue;
}
+ if (sc->sc_rxmits > V_tcp_ecn_maxretries) {
+ sc->sc_flags &= ~SCF_ECN;
+ }
if (sc->sc_rxmits > V_tcp_syncache.rexmt_limit) {
if ((s = tcp_log_addrs(&sc->sc_inc, NULL, NULL, NULL)))
{
log(LOG_DEBUG, "%s; %s: Retransmits exhausted, "
@@ -1430,6 +1433,13 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *t
sc->sc_tsreflect = to->to_tsval;
else
sc->sc_flags &= ~SCF_TIMESTAMP;
+ /*
+ * Disable ECN if needed.
+ */
+ if ((sc->sc_flags & SCF_ECN) &&
+ ((th->th_flags & (TH_ECE|TH_CWR)) != (TH_ECE|TH_CWR))) {
+ sc->sc_flags &= ~SCF_ECN;
+ }
#ifdef MAC
/*
* Since we have already unconditionally allocated label
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
