From nobody Tue Oct 06 21:25:14 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 4hzq6L6Lpwz6cVWL for ; Tue, 06 Oct 2026 21:25:14 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hzq6L31FKz4jm9 for ; Tue, 06 Oct 2026 21:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791321914; 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=sBxBcTNasCzNQg8LYyrIjZoBrRzR2GjuEuRo9vUQGDc=; b=eK2Uj/CsHoZJIvd8UXNjphhqdvReNROScHgJpYvS8wtsEABdIWhc8QPrN3ViJqT9yGmVAQ OHXhmPyS9XcD1AeZbvfQKTqK0APG0wORz+VVC6HByKlIHavxX8IZxnar6iJFHxzN9DzZUu J82hBUPNitF8RGddY8y/lmYbWTabuh84N67KhoaRQvXCrsyNV1lOHY+we+KFePjVY/LDaA gKLzfxR+CrkWwvA5V3JsSP6zoC4QCo1+mI88jyzAfCYXWoIBCmClj2ggFLxD6+MMcDul3e 0roK/Src3yLkLmBZC6th4VUMOw8cY9fSnUu7w8Okfwq547wY9s5dx0jFtVpY+A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791321914; b=e1DxqakXcYkl3/GVXy0pATHIQoWxgI8tI/85S9aQuWHKBIPJm+EUFoWWaqzQPsmI9yQAnm EawUsMyoB0mkaWPCZLT+P07ZblAs8VAnZdXz213SfaycD5s0ZGJoCPzlxg413C+HAmlGzm SB+EcCJvSw0jo8ax0cZxNTunsZsE4xc635AR73SqGm0+DQKNDFxx+0vXDRVtS6HNTbzA12 0HbHdWhoq2jFH5+jVrMaLmRx3BuQjRxIPRJ93j4veNpFqBD5gyWnnPljFY9CjbeRihWuHs ans4MV8sSdHgTqQ5zvr8nla+9SBi4OHia8zl2K6HfBfaLZVP3xfuMY+MxMgnIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791321914; 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=sBxBcTNasCzNQg8LYyrIjZoBrRzR2GjuEuRo9vUQGDc=; b=lViL6kS3x7WXz5u9NvG590GXzWHLam3pXI9gSE1Hs0CL9/77QeYE0MwLxlHmx2bHfZII/0 6r+zsoxuFOy8AxSJowLrcBy/ZHgNNslo0gNqdeebhUcY7WcSyETJFTUdiSYRUCajQlAQa0 QSK/YIZBpV7xgcj2L5f4RkmncBynB8nDRHzejPBa9bgLELMuI4L6lupDrN7iu+6hWTbkAP vjJnV5xapD2B1kzDXHdNC4voJLAzFP9Ub8R1FqAHd3mD3py7uNiKteG8M3ANZJxKGq8iJ4 5wsrxrHXdq7/PROZ+GEGvWI4N5Z3iVmam0WOiwTFSEhVXmvmmLTlArkeqR2d8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hzq6L1pdyzNFV for ; Tue, 06 Oct 2026 21:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 206d2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 06 Oct 2026 21:25:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3b4437e9c9df - stable/15 - pf: set the correct type for rule timeouts 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3b4437e9c9df13612b9958144dbb7a77ed22a258 Auto-Submitted: auto-generated Date: Tue, 06 Oct 2026 21:25:14 +0000 Message-Id: <6ac5673a.206d2.208af511@gitrepo.freebsd.org> The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b4437e9c9df13612b9958144dbb7a77ed22a258 commit 3b4437e9c9df13612b9958144dbb7a77ed22a258 Author: Kristof Provost AuthorDate: 2026-09-28 18:11:45 +0000 Commit: Kristof Provost CommitDate: 2026-10-06 21:22:37 +0000 pf: set the correct type for rule timeouts PR: 298877 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 3c58e64369fd8124c83f1c7d63106bddca83fa1e) --- sys/netpfil/pf/pf_nl.c | 2 +- tests/sys/netpfil/pf/src_track.sh | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 5df1457594e7..b8655297f782 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -676,7 +676,7 @@ nlattr_add_timeout(struct nl_writer *nw, int attrtype, uint32_t *timeout) int off = nlattr_add_nested(nw, attrtype); for (int i = 0; i < PFTM_MAX; i++) - nlattr_add_u32(nw, PF_RT_TIMEOUT, timeout[i]); + nlattr_add_u32(nw, PF_TT_TIMEOUT, timeout[i]); nlattr_set_len(nw, off); diff --git a/tests/sys/netpfil/pf/src_track.sh b/tests/sys/netpfil/pf/src_track.sh index d86b4ce6c466..cc0f11b51413 100755 --- a/tests/sys/netpfil/pf/src_track.sh +++ b/tests/sys/netpfil/pf/src_track.sh @@ -588,6 +588,30 @@ mixed_af_cleanup() pft_cleanup } +atf_test_case "pr298877" "cleanup" +pr298877_head() +{ + atf_set descr 'Test per rule timeout values' + atf_set require.user root +} + +pr298877_body() +{ + pft_init + + vnet_mkjail alcatraz + pft_set_rules alcatraz \ + "pass in keep state (src.track 10)" + + atf_check -s exit:0 -o match:'.*src.track 10.*' \ + jexec alcatraz pfctl -sr +} + +pr298877_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "source_track" @@ -598,4 +622,5 @@ atf_init_test_cases() atf_add_test_case "sn_types_compat" atf_add_test_case "sn_types_pass" atf_add_test_case "mixed_af" + atf_add_test_case "pr298877" }