From nobody Tue Sep 29 19:38:01 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 4hvT3t05jNz6v3m2 for ; Tue, 29 Sep 2026 19:38:02 +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 4hvT3s1wj8z4sNh for ; Tue, 29 Sep 2026 19:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790710681; 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=wWfpigG9s/UDrri+AxJo0OBst1AM5y8a96fMF+8D2PM=; b=q4IEpSW/uE8BII04nt14H4SNy2Iu1IbKZVO/yCZ9mfJgIuN1lgq/YNXs4UHcR0sErx1DHu hgLH5sr+h744PfyTTwLDpel5Ak4viE9P5HcTiArDXRrqWB9Gs4SQC8eyIXojfqu3mMFCcN E4TkUxRIUPRCEm/5Ni8tEGkbE31AMnDvgwVekCT5d8r/xXiazQUo37nuCxPV20gS2AD8Oj wPY93lrUZzqCouHCImjqfjD5+JpxyQ5SnbSPSJf2Mq5mXrZDhkv9w/kiEHPSMUD/WCqMyA s7bWsmCWCkDGAhjgdNv2XWkC6MAB7hkoX4kBJDB/0O8v5pSsPduVwIYai/YjKw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790710681; b=ckDJ3qkVjyucHZGUcSHS6jb5qMAblKrPkLJD4QKBrdNS3HKUE/RfrxTA4+MUX8rjIY6m4L JFtGdGsvkTnojsWenaTSuBm/q7tUIYVniANTxqS47MogfKkQnXvI4jsQU/4XttprYkoFOZ kGE8JvQ+6rn7PFxfXjtJfEGQlGt09R0hp72ZTLjUyM3r+ccz5HWtEL55WcTbLZlYvhDWXb vIgYStHrQiPwxgoqQ2GeN+ud+UwoXMNCGvwXRV7bLsyUbWVVeW+Q6/VwyJTLxOwSXjQBaN /Gh8U/eaRyizsIQ5TtU6YvZXpIo72OC5b1tUEH34PL/esJ6HfQrb5CUewKBd6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790710681; 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=wWfpigG9s/UDrri+AxJo0OBst1AM5y8a96fMF+8D2PM=; b=OVHhXac6RAKO9iDuPz8HsZtc50+SAhbFte8RYNy2x3r0HKq+qaVtsAaEav2mAP/SB2CBVP 99Orrarsqmm/vQF4AuGGX/EuLntqKVLcjeJmyCp7et+Vns9pbNqRLjVdQMNRYnis1V2kj9 NOsyjK7DjuhtIekqgiWeGAoTTK5TzdRyk1vSRoP+FGr06yqz7fHPIshSAEMhtJ7V7u3dCd jcBbz/8xqIo5yc9UZ+5YvkXJb7xzrn5lY0z3fUWwEQJyMImK41yhTVwNajlRYI5ZtPf5iq QZ960Dw5kUJiFt+X+SP06ZJESjDTXNsuJUjHwjHJMmGnabVm6v+ju2RJ6g5qMw== 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 4hvT3s0sPDz1RYR for ; Tue, 29 Sep 2026 19:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 477b5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 19:38:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3c58e64369fd - main - pf: set the correct type for rule timeouts 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 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/main X-Git-Reftype: branch X-Git-Commit: 3c58e64369fd8124c83f1c7d63106bddca83fa1e Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 19:38:01 +0000 Message-Id: <6abc1399.477b5.d8c4046@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3c58e64369fd8124c83f1c7d63106bddca83fa1e commit 3c58e64369fd8124c83f1c7d63106bddca83fa1e Author: Kristof Provost AuthorDate: 2026-09-28 18:11:45 +0000 Commit: Kristof Provost CommitDate: 2026-09-29 19:37:07 +0000 pf: set the correct type for rule timeouts PR: 298877 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_nl.c | 2 +- tests/sys/netpfil/pf/src_track.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 2f99d1e7c845..8a04c330f4eb 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -723,7 +723,7 @@ nlattr_add_timeout(struct nl_writer *nw, int attrtype, return (false); 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 1b09030f6174..90a25e6970b4 100755 --- a/tests/sys/netpfil/pf/src_track.sh +++ b/tests/sys/netpfil/pf/src_track.sh @@ -660,6 +660,29 @@ check_valid_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() { @@ -672,4 +695,5 @@ atf_init_test_cases() atf_add_test_case "sn_types_pass" atf_add_test_case "mixed_af" atf_add_test_case "check_valid" + atf_add_test_case "pr298877" }