From nobody Fri Jan 12 15:50:58 2024 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 4TBQxH14Vhz573hr; Fri, 12 Jan 2024 15:50:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TBQxH0X18z4Nwh; Fri, 12 Jan 2024 15:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705074659; 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=PqkvuVtsclB5AF0hUzS9d6Y8bDHMzn3dVv59vE0rEoE=; b=Pxlz2KOlR13XiCjzEF0Hgb9mSlI8pScyxqv1xBKDFYmiKBu+fNxaMBvaH14172khjRZPVT ceWqld2T0oHvU65ZcOkNEHzHKi1nO/YkX2fDYhxxyj5qlXKA3WAjFXYnwsTcxlmgVv3cUT FuoJshU2seD07OlG2FfjYfTDhby7v9DewgBLTC0Is+/kMH7nkd23tRe86PXHVbWczOMpk2 yzxY7Vw+VvrJCRmpwqOFW+NSfs7Qt+9RXCI458RS4JTOKcFgOPAlaEQSQJ7ES1jdIk7sd9 1WM6EjnIJh6K5QEtEoUwN+c4hhOamQVllryu+hk9mEkh/Xn0MG9NnT44ziBxYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705074659; 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=PqkvuVtsclB5AF0hUzS9d6Y8bDHMzn3dVv59vE0rEoE=; b=H9ZrIFwCMC0ybTl5SN5U1ON+ka4tlWN8OXRWo7Xvt2q7jW4PxQYtvFcD8iOZx32E6/NeWO TB3TzqEY1ZY8w+W+9/qY5tQKHFg0FMFXsip6unKVnek+gG5HmgWSkeQU2igWsGWuIAZqef beT9UVqDihK9xTr38nTb+w/gqx262yvTDSfGlgdsUyAQU4+82MywWHI6x8nryHqQvAPlRS sgYa+vNTDlOKjqtpPcIr8sBxPl8Bc4J3IduUZMyXA5rDOqLMuPO+ZpugjKZ+4Sc3QjP7nO 4f4YqRBr0EaFEeLbYMFW3CjGiSYGjWFPm9AbgT7P2jMBVIrbbD9apKFep4AIkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705074659; a=rsa-sha256; cv=none; b=QNcH7EVCL7LJRO12qnVRkE6JPeFvscMqRdVGXqdKmnkqzhLpmBlrZeo07I1ZYGscrkyl1D 06YacE0urFfydhhCAtMiZZqa6GiMDKd6Gl7FRswfa0vxpiGUDUbDtcZZ+J799Pln8NrY1N jQtAIUfzdd95hSGxU3rjHnp/1KIsrIFqPnzmyeAF5K6b6GVRdnsh4wqFA7fOF8L+ENynRA GWibCErI37lj1dsnUXhb/xJjrc3Yi6wEHCVs4YebQe5se9psPD+SURA1lvDZAO3lY2/Yf3 BUwDRMIWYAJWlNUPPgXhmy7HG0VkaUMxkG1vE6g8b583XNJX9j0kt/NXW/e2xA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TBQxG6hPzz16wp; Fri, 12 Jan 2024 15:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40CFowjI086312; Fri, 12 Jan 2024 15:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CFow5t086309; Fri, 12 Jan 2024 15:50:58 GMT (envelope-from git) Date: Fri, 12 Jan 2024 15:50:58 GMT Message-Id: <202401121550.40CFow5t086309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 3f57a09489e5 - stable/14 - tcpsso: support TIME_WAIT state 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 3f57a09489e523fdaea4c927cf725b65112af56c Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3f57a09489e523fdaea4c927cf725b65112af56c commit 3f57a09489e523fdaea4c927cf725b65112af56c Author: Michael Tuexen AuthorDate: 2024-01-06 20:31:46 +0000 Commit: Michael Tuexen CommitDate: 2024-01-12 15:38:23 +0000 tcpsso: support TIME_WAIT state TCP endpoints in TIME_WAIT are not handled in a special way anymore. Therefore, they can be handled now by tcpsso. Reviewed by: rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43351 (cherry picked from commit e179d9739b1438ae9acb958f80a983eff7e3dce9) --- usr.sbin/tcpsso/tcpsso.8 | 12 ++++++------ usr.sbin/tcpsso/tcpsso.c | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/usr.sbin/tcpsso/tcpsso.8 b/usr.sbin/tcpsso/tcpsso.8 index 36707d6657d4..c06cd8adb25f 100644 --- a/usr.sbin/tcpsso/tcpsso.8 +++ b/usr.sbin/tcpsso/tcpsso.8 @@ -74,12 +74,10 @@ and value on a TCP endpoint from the command line. .Pp TCP endpoints in the -.Dv TIME_WAIT -state can not be handled by -.Nm . -TCP endpoints in the .Dv SYN_RCVD -state can only be handled if their prior state was +state can only be handled by +.Nm +if their prior state was .Dv SYN_SENT . .Pp .Op Ar level @@ -176,7 +174,9 @@ is one of .Dv FIN_WAIT_1 , .Dv CLOSING , .Dv LAST_ACK , -.Dv FIN_WAIT_2 . +.Dv FIN_WAIT_2, +or +.Dv TIME_WAIT . Using .Dv SYN_RCVD only applies to TCP endpoints in the state diff --git a/usr.sbin/tcpsso/tcpsso.c b/usr.sbin/tcpsso/tcpsso.c index b79ae9767fe2..7e7e25246d80 100644 --- a/usr.sbin/tcpsso/tcpsso.c +++ b/usr.sbin/tcpsso/tcpsso.c @@ -115,10 +115,6 @@ tcpssoall(const char *ca_name, const char *stack, int state, continue; - /* Skip endpoints in TIME WAIT. */ - if (xtp->t_state == TCPS_TIME_WAIT) - continue; - /* If requested, skip sockets not having the requested state. */ if ((state != -1) && (xtp->t_state != state)) continue; @@ -453,7 +449,6 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; if ((state == TCP_NSTATES) || - (state == TCPS_TIME_WAIT) || (argc < 2) || (argc > 3) || (apply_all && apply_subset) || (apply_all && apply_specific) ||