From nobody Sun Mar 22 07:23:57 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 4fdnq73Qbdz6W6cC for ; Sun, 22 Mar 2026 07:24:03 +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 4fdnq71hZtz3Vvh for ; Sun, 22 Mar 2026 07:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774164243; 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=kmMvGNFY2XKbsx3dfPThXLP2NSJ/FllJW5xt1TIhh+0=; b=aB/bFvfNlLBZB5uVs7i4lIVUmpSwYwraGtupMH8wRrNcBMLxPVxribFF6oQqQwhRgdkCCg z3fYYQOhJxcF9ElI38DaVHj6DW1sd/THlBJf/oI46n5E3VBmQejcmwQFxe7vh/KA8sLKUG y8Ln3KQVi7Zz00nQwmww4MFWYIOgj2SaHtcztiWUIYjopWtyFF7kq3+k8PKSeuIuJkJifv 8rgn3H0X5B5qNRwKpWCRKFbd9VtE5+48jm799pfqOFRoGwaLg09iKD49H8JvMuOsoo6CxQ 7fgOI2vLEuTPaSctKdWTQNJezvxSsHsL3Hn7596Y5HMKCYrpf4g/80adZ+BkYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774164243; a=rsa-sha256; cv=none; b=x8hJsmrxOIhOLJBBIt5YeP/EN/vOFd76H68qubVmMOJdWaCNrn+PeXnY8Hx/btqtabBC8m OHwl1Yf7SWZ3w9ZHncWvSYP/ptsvve8QLiXF0hPxuPCC3dYUmQPiO1A4hHFYZKwsZhOZpX 8T1mvrrtlBrjeHwh7yZ5kSn8+l8GlBvgGiHis4KbjqD4vivsA4349H12hc72Kh2QnTTLkn ws+ag1nE1GuOhS2n0y/UepBgXfUwwJuKqakV2/+cDe2RUNP0GlaWHJx0G6M/YrAnSbP7hy Kj9B8Yl5Zmpd6kGTS/aGzWRCS3wO2SwXVIbRn3u7mzlI1D4jmWnxAyeyZ4H6HA== 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=1774164243; 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=kmMvGNFY2XKbsx3dfPThXLP2NSJ/FllJW5xt1TIhh+0=; b=p/2sjOdTvnfmysIyEY6PIofkGZeLQFnVij5ge0YMhaRdWTwH9OW84RfdVvKttxgOTrvt9V KvggoA3rX3HGfPcPb0OVE2+ZHFv+fPYbIVbvvjyhMsjCr6mm9ouo3yX9Ti7bUkgHwrPTa3 4E/mZD7jN42YvM5OHSS3fVAzp1yiJwfcQiwkTua8kJ3kdnTo2VUMyOPEggZU3jnoHvOgz0 e8/IjMPO66F8T+yyFNc+dJttdypVyBjsEMA0awuTzmA1rGFj95FJV77ib5kJ9UA3CBzy/0 jjnvfm1+5fNRnBcZjFtMiYlBF4GBR41nQsEZ+yda1QoRj2lJhFkqh8YzldqQzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdnq71G0tzqP2 for ; Sun, 22 Mar 2026 07:24:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3eaa2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 07:23:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 434e1c3d8413 - main - pfctl tests: test rdr-to and nat-to in one rule 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 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: 434e1c3d84135d1c3a6e578fdfa4b508f0914494 Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 07:23:57 +0000 Message-Id: <69bf990d.3eaa2.6ccbdfda@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=434e1c3d84135d1c3a6e578fdfa4b508f0914494 commit 434e1c3d84135d1c3a6e578fdfa4b508f0914494 Author: Kristof Provost AuthorDate: 2026-03-22 06:20:48 +0000 Commit: Kristof Provost CommitDate: 2026-03-22 06:20:48 +0000 pfctl tests: test rdr-to and nat-to in one rule OpenBSD fixed this separately (in their 6a338f3f70). We appear to not have had this bug, but test for it anyway. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/tests/files/pf1079.in | 2 ++ sbin/pfctl/tests/files/pf1079.ok | 1 + sbin/pfctl/tests/pfctl_test_list.inc | 1 + 3 files changed, 4 insertions(+) diff --git a/sbin/pfctl/tests/files/pf1079.in b/sbin/pfctl/tests/files/pf1079.in new file mode 100644 index 000000000000..78a3f148f815 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1079.in @@ -0,0 +1,2 @@ +pass in on lo0 proto tcp from any to 1.2.3.4/32 port 2222 rdr-to 10.0.0.10 nat-to 10.0.0.2 port 22 + diff --git a/sbin/pfctl/tests/files/pf1079.ok b/sbin/pfctl/tests/files/pf1079.ok new file mode 100644 index 000000000000..437e881855a1 --- /dev/null +++ b/sbin/pfctl/tests/files/pf1079.ok @@ -0,0 +1 @@ +pass in on lo0 inet proto tcp from any to 1.2.3.4 port = 2222 flags S/SA keep state nat-to 10.0.0.2 port 22 rdr-to 10.0.0.10 diff --git a/sbin/pfctl/tests/pfctl_test_list.inc b/sbin/pfctl/tests/pfctl_test_list.inc index ff51af7562d1..a2c64dfc0020 100644 --- a/sbin/pfctl/tests/pfctl_test_list.inc +++ b/sbin/pfctl/tests/pfctl_test_list.inc @@ -187,3 +187,4 @@ PFCTL_TEST(1075, "One shot rule") PFCTL_TEST(1076, "State limiter") PFCTL_TEST(1077, "Source limiter") PFCTL_TEST(1078, "New page") +PFCTL_TEST(1079, "rdr-to and nat-to")