From nobody Sun Apr 26 08:10:42 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g3KBq10n8z6bDJb for ; Sun, 26 Apr 2026 08:10:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3KBp6fR4z466g for ; Sun, 26 Apr 2026 08:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777191043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2250pvT5NTim4topA/BEyZB+UEOyf4QCgoPLjaI0ypg=; b=jTEjRuFlImxFhhMt63A7mf/w/ep81stIS1/JmJL5P6dkK4F/ZINBlJQxYiphXV4FG08G+7 KUCYC4mSPXHM4dJhVLbStJLVPQQOLgz1Kho/PlMRo6+RCMiDuKADHouxmPVJut/Kw7wLZw Q9FTF1CrvH37ifxmDgRSaa9MsbouJoWEn5yKUqW3foXwdY9ehucVYh+fTAD+nMuJpD7Cl3 DFJ+6Ngfb08pTEByYjKWujk2iDeJO48U8iV0lVWDJdY0Jn06B1xMJfBpE6DgjHVV8sbQRQ MVzBx3x8bYneJxsUAGR1NIEZkuIWQBo7Wnc1VV0HqYeoItuPZ46haPYmXYZGmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777191043; a=rsa-sha256; cv=none; b=JeIajUf8VUpcdHjZ7pqqfJVhuLzb5fP3q5WIqwoFO6cAWJW7qL/IZ7aUCN5kPchcM3nLA9 pz5HohgmjmCf95/B+q5omuwvcih7ZWJC1myMTAMLvVGoNtIXEFC510JKnY+to1IDIeDEps ibbLPktJ/M6GePIfjJZwwwQ1PW9SyReqDdfy9fv+Ac/lxWFcaOEt4Yz2kuKHfx8w4O2g1R 9qYBIa7WkNoLf6M5iXX3iVa2ba1PyUVdNLryB5G/zFuV70KJLR4ua6BoQJd2VUKkh7VrPg 4qm2VQUQrF6TP96FFaH7fQVsfDvbjWXkLVTndeV+q9k7GO/V8dqukTivJz/45w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777191043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2250pvT5NTim4topA/BEyZB+UEOyf4QCgoPLjaI0ypg=; b=BFCQ5uJYrLITVU5ClbpO7lLg0QI6KMVGZ5dIG3PBDXZTvAqkjXnO9d44KscVl2VLiXcYYF OX8zkTO6y4Dqrybh6b0Ml5dDzHtFph5aLvZqv0yzj0Eho2DpnTER5Go38gsNf7zE7J507e dui3MgtB5vqhwuaMVqb0XwzdPwsFbr1/up0BvGOKsG1eWiCsPTWa5NQQVeyJPo6CEF1a2L LjdKWrtxAHcKfTxwjMJjxFLFxXhtYXuCFIqBgb9P/jBtWn9rvIJZrtxwSg2cIlHc/18GVe dm1O7H2jeHZL19XagOUwpC9oWJomKFfhQAGXGICXkADw5CRG1LKq74ME3RO/gQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3KBp6DxXz1BBK for ; Sun, 26 Apr 2026 08:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31431 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:10:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 724ad12c947d - stable/15 - tcp: use RFC 6191 for connection recycling in TIME-WAIT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 724ad12c947dabaa9f62f81f4342a738e0f42971 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:10:42 +0000 Message-Id: <69edc882.31431.66996632@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=724ad12c947dabaa9f62f81f4342a738e0f42971 commit 724ad12c947dabaa9f62f81f4342a738e0f42971 Author: Michael Tuexen AuthorDate: 2026-04-17 07:11:41 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 08:09:03 +0000 tcp: use RFC 6191 for connection recycling in TIME-WAIT Implement the criteria specified in RFC 6191 for recycling TCP connections in TIME-WAIT. Reviewed by: rscheff, Marius Halden Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D56321 Event: Wiesbaden Hackathon 2026 (cherry picked from commit 3a54aa3b0911bef15e014b8a8185e116efb0a918) --- sys/netinet/tcp_timewait.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 66103f8d0b11..d90178ee03ec 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -261,12 +261,17 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, /* * If a new connection request is received * while in TIME_WAIT, drop the old connection - * and start over if the sequence numbers - * are above the previous ones. + * and start over if allowed by RFC 6191. * Allow UDP port number changes in this case. */ if (((thflags & (TH_SYN | TH_ACK)) == TH_SYN) && - SEQ_GT(th->th_seq, tp->rcv_nxt)) { + ((((tp->t_flags & TF_RCVD_TSTMP) != 0) && + ((to->to_flags & TOF_TS) != 0) && + TSTMP_LT(tp->ts_recent, to->to_tsval)) || + (((tp->t_flags & TF_RCVD_TSTMP) == 0) && + ((to->to_flags & TOF_TS) != 0) && + (V_tcp_tolerate_missing_ts == 0)) || + SEQ_GT(th->th_seq, tp->rcv_nxt))) { /* * In case we can't upgrade our lock just pretend we have * lost this packet.