From nobody Wed Feb 25 13:09:24 2026 X-Original-To: dev-commits-src-main@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 4fLZg854TNz6TTTd for ; Wed, 25 Feb 2026 13:09:24 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLZg84Nj3z42m0 for ; Wed, 25 Feb 2026 13:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772024964; 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=rlOU3AijB8f2b8ymAl+Ympzr9Qj1nKP7y5z5VEYLTws=; b=DA2jct/aL53H/x17Ojm/NkxRPcGiBwAEMCtzt42wlGGXadqscnGy/slyo4z1SWZn9NSGpG 87tpy7j8zZz9YBRPccIM9Nv/baPu/nW3IoJeC4fKxrlN3IQyFu0zBB9yPp1eHOTWD8s6qb 5i9YJonLlB4858XCBEkhj/yUcUpSB3mhx8ThjRwDLwSbBYD0fJUnbwiAhiarQRVHMwciy3 kyxyjCHUL6P/u5WhxbDB7IPXXU5c+zVfBOt4izrsJFdhuXjKb54YN9sVjkOFb0I8+iR+xz eK5FIbPXqC+LSRZ/u8PEs16nLRS9pBIFAAqs6p6z1ZrIdBsz/eylLYq/gcDIBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772024964; a=rsa-sha256; cv=none; b=qDo2CqUo+y6DEKrXTZYRqbuCj/gRJ2B1ZhXc7LIkWKAEFsa/G69Yv+cg+dLAExh/4H8OVg xHioBZIDpWSd98a47BmqSS3yvYARBvGb+Lch1FeL/9DWfym240uuPAk7oI4UVafoI+Mu+U ij88goR5CxP199w83s3ei/57CIQ+hsMOpTFI5Bn65zBv+saFm7c067YkPPSFG4bpK9A3RS ln1Xu85RmTiUScj8soxwqMc0rnsJotm+by9pjawuynJmDnTdiJIjsYjqW77AyXeoUNg0/6 B2+7QuVFgKLOzaqxa3RzLDAuVDWFiSBFAEy1bibIKwKQmb/uxI3dDdDNAoXR+g== 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=1772024964; 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=rlOU3AijB8f2b8ymAl+Ympzr9Qj1nKP7y5z5VEYLTws=; b=JcQ6QMb3I/Nni9KZQyYto2x1fV0o3TUZo98Z/wcQOZ+sGKquxWfC8D/diWNigBJjD0L612 YaQPdcPeQvgwyNTlZ+A2NaSeCK+YV+ajCb0Ovsv++pnj3O4RVqhefgXPIOpoC3GlYamCEP mHOJfakzyntKpHCSh9Se7Yu1nZdsDgeiH6UeBCFd3+gNBiJ5ESOSK9w9ujP2rsFIFXneyL /UykB2epQyRlUprEo1CMiNJ2AjxMs59D+BUFmR57q4YcH1ay5EMrZdEOlD+1qZOhjZPsiG 6fxxoAExPAc9GPrDESUGq+PChnJaKzfy3njgoMZxT5HYVxI2BUUfK5/MgSIJmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLZg83lFcz1339 for ; Wed, 25 Feb 2026 13:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43768 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Feb 2026 13:09:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f3364d3c8c87 - main - tcp: improve handling of segments in TIME WAIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f3364d3c8c876074a9a6f68168e5eb8bd60207de Auto-Submitted: auto-generated Date: Wed, 25 Feb 2026 13:09:24 +0000 Message-Id: <699ef484.43768.3dbbc2ef@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f3364d3c8c876074a9a6f68168e5eb8bd60207de commit f3364d3c8c876074a9a6f68168e5eb8bd60207de Author: Michael Tuexen AuthorDate: 2026-02-25 13:06:15 +0000 Commit: Michael Tuexen CommitDate: 2026-02-25 13:06:15 +0000 tcp: improve handling of segments in TIME WAIT The check for excluding duplicate ACKs needs to consider only TH_SYN and TH_FIN. We know that TH_ACK is set and TH_RST is cleared. All other flags, in particular TH_ECE, TH_CWR, and TH_AE needs to be ignored for the check. PR: 292293 Reviewed by: rrs MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D55489 --- sys/netinet/tcp_timewait.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 847598422da5..ba5c90c91e43 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -287,7 +287,7 @@ tcp_twcheck(struct inpcb *inp, struct tcpopt *to, struct tcphdr *th, /* * Acknowledge the segment if it has data or is not a duplicate ACK. */ - if (thflags != TH_ACK || tlen != 0 || + if ((thflags & (TH_SYN | TH_FIN)) != 0 || tlen != 0 || th->th_seq != tp->rcv_nxt || th->th_ack != tp->snd_nxt) { TCP_LOG_EVENT(tp, th, NULL, NULL, TCP_LOG_IN, 0, tlen, NULL, true);