From nobody Sun Apr 26 09:27:34 2026 X-Original-To: dev-commits-src-branches@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 4g3LvV5mLjz6bMH6 for ; Sun, 26 Apr 2026 09:27:34 +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 4g3LvV4xghz4Ls6 for ; Sun, 26 Apr 2026 09:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777195654; 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=RTDqlhukkuKBHC5shz993CmE3kVVfPnIPopY5THids/wTmfOOXMtL3Cz4+AQqqPv39B32Y OEhQ7+fCDslQn+pg8uq4lPrJ0v7aXeFIo7BY8Y/vYqWkvS8U2Ai+I5Phxl7JjxmjRRbuHp IOjDQWXAIBc3Se/5n4EpfV53wpH7dtqAMTqAoxrQbg6F03KsU9VJf3HblPeDn7H3B8w6Yh cousRxEFDrMQhnnTwM+CHXs8S/qKhEuGqwLgVlOGIP6EI4I/sN2mXLMLyvnEIP+xskPC7+ mMmXY0D71doYy63rmay+0f49P9KulRmj1RiUqW6cMJzztSBn4lcYIuS+T10tPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777195654; a=rsa-sha256; cv=none; b=jTS5G5aSg3wLqCi03vIo6axYo4YfemzOhna4+Lqd8GQqVUfywOmdHlpOQEDL4qD9eVzx3/ ZomYHwgmHhmRpJ0Du58xIm3NBFZOpxcKOqxthNaN7wBVgWPekTuw9jzjVn6tUvFlG9kEaK Gl1vADNjHfBjJUZUxO6XjMC6oaiQ+i6bTjaILekmJb9qjt9qA9/4o3NnvkNa3xOCPPhdC+ /fLzzp7xvqLBUEN+vbZ7+T9jEYEsB7vJATvYwWQF5FDhFrhqb1EF1TXMNgf9GQPF9ME9HS 5otGXm7tr69BnwGwM2F/kBFLRhjeF38av6dQVRMjS4btcmBLGnZcbe0IZKhKtQ== 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=1777195654; 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=wdfelbHwWLjPweDq9On5EY0Z0+XFCcNgGbZgVherrqEis26zA+eugKsNOYX7biFU16LdOT xEaHxZK+3huSKJZcuIkptIrXTe5a2MHjHpSiEW1SUax++BJf9Ed8S6XXElILiJQ+P8Pfv1 x8KNXyp+QABEVSYxMhQ2WFsSJD45SH3lLBqG8RBPbt4a0Gi3kdEesrCazm7eupb8Mpr8bo t4KOxsuxePDwHrrXtg7EeIkaG3w6lOv6SVTCPThIAxNFGzXJIiECNXItBRWB01VuACv+aC aRk817iL168Id9ae0H+fJ/hsi+GZy2DYUB5Vogdp0esh/1nfYwnxSsZkcqb+Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3LvV4BBJzHM for ; Sun, 26 Apr 2026 09:27:34 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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.