From nobody Sun Apr 26 09:27:34 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 4g3Lvc0jwKz6bLyC for ; Sun, 26 Apr 2026 09:27:40 +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 4g3Lvb7359z4LnH for ; Sun, 26 Apr 2026 09:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777195660; 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=pVpVnbJZC/AUL6jYn88doigGFipk5uNaPjxqTCHFVQ8=; b=Bt6ymLaeTGWQ5sCgBmWIFJYmy3CxdSFVOnjwoFg+sr8zSz+QU/0fHb44fw4MxpskADHal9 85kdBBcRuRqR/zaNtaHxxDFPEEGZHATbG3uOKyQWxqwhYG4fq8IdfZ23l8ghnEBCSfpeIw y9wegLFGsGX2vVDt8xtTInnwNC7cvdV2Rxo/IYHMXK3avI7SSsycss0khoDvEKuMDWCZxj YYrHHiODO8TLX0EGCtKbXcHyzHUN6VUpSPknpx6hwi4ck5nzAMY7ZCh5b+r5r5Tx+R/CoQ B2pM9rO2Q/9h+OSxth+e4CC8adeaVfnw2Ude2yBWzQ9X6qglNLOt5zmC4u5dXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777195660; a=rsa-sha256; cv=none; b=S0nfhgE11YxlbyBfZJHiIFryT9Z1fmcNk6EGpWmftFxae26hB4WvQ7Nff6ptpYzGHhc0pq U80zS6zl9gwc/Wow3raJXR/3UJ1YQh1zRUmv9HBU7VlCgyufpzocSNdV9yknK6y3K+lV9F 0QCimXwFl1PkOxxdSBpfaz8ba82Tcd+vsLf5iK5y4xV0PRRLzz2CITbd7RuH8gdyQjZ45o 5Lj8YBTJjTEMc0bCEs4QPGSOajwngOHzEnp4jGfoyMte8iGpXCaGa3mIgwH0stirznuklX X6ON23riQGhNexBYxYU7zrUcUa3lRhCxsC3yLYsOIfGM/0M7jP1NIYhBJciAVg== 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=1777195660; 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=pVpVnbJZC/AUL6jYn88doigGFipk5uNaPjxqTCHFVQ8=; b=TWwpwrmhNaZmVubPO9c8lk1heTgy5ZdZVvZmh/wTkhEjszb4jCnpNPlKtl38rt78AVvhSl tPYnCGtphkj+gcAvmuJVjxE4ltVb2dze/3UZeeMlbIqgvN0CVO40PzhAaZHhPWVcui5t3p VAUaIFBVwBiugl6V6IogoI5hE2we8/sMRgagW4MfInatG10CfCAzAaA0fXR5WFe4h77xDA TEPndUK19tLDvx1Az32kovubdsjXAU/AvURirDxrlMYjG4sdIsR0kgPNZypQsj12XmgMDK UPKCzM/5MPwQ/GP4bOcm/FlPPdyY3saZCMs8DsBvmi8ej7atZZ+d+stUMM/q+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3Lvb6Q7Bz1Cbv for ; Sun, 26 Apr 2026 09:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39806 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 09:27:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: dd0e6909ca84 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: dd0e6909ca842e98066b108ec7efb0d55951260b Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 09:27:34 +0000 Message-Id: <69edda86.39806.6882d20b@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e6909ca842e98066b108ec7efb0d55951260b commit dd0e6909ca842e98066b108ec7efb0d55951260b Author: Michael Tuexen AuthorDate: 2026-04-17 07:11:41 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:26:06 +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 a833248cd468..f8c8dbe3578f 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -222,12 +222,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.