From nobody Sun Mar 22 07:23:57 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 4fdnq21WlSz6W77Q for ; Sun, 22 Mar 2026 07:23:58 +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 4fdnq20gNgz3Vcw for ; Sun, 22 Mar 2026 07:23:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774164238; 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=DuU3SQXqdKbs3ocz4+Zi9jhl2R7v7z0FV8kPm1bP1FJ0rxCbCOo4b8gS10onK+Qh1SYhAE W3qqmzY+xEVVxfBl9iQV/v3JGS6ffqJKPkgWSRJ4hP88K9nG0/W9wUilOrFt80CfoQvpcQ F8oYo9BmJ9ysHUoh6TEQc2OUdaQzbrELYaql4FTg28V/wtutQ5FPlgjd2qmV1Ye+lrjnI7 Pkd2m7ZP6+GzuA6yc/h9z5lFaoKigX0tCeIArJNNY5MNVSdzj7NwpC1g0gs+ueyd+lc/vc ojJbx44yJnX33lAixc/7QXQZkSpBS5+GsV5bM/RMK/KqGowKM/DCydkt1SRnsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774164238; a=rsa-sha256; cv=none; b=O9rnlFZdrx8rn9lIOfWUbtd6jRYTGTytpFqXqaem93oNh3c1F7PdHg6LnKp/koKkOvA/xr MUXKXd4sQAerW5E0CyBgFBroCy+ysxJr9HvWwvAZkltOAfJQRfQPB/Qpk9Rmr1dVjjR5+V nr5O58+LPHOnheubwYf1/KY9+f4qcp9bkk6a6HqjLdTFXJ2kx030Zrja6X+pphgUgM4W3u heiPC/QBfVjK6JYKHWz6y5PKl55Zpf0lktIi71gbjVJgtPgabcYTFzDmtPM54ZqYz47o/x dIHxDIZ9Hi/ctX9X6SXkJVPnZnCoPDt8R+StbIRbhRCuTWxLpCNp0Z+ZmpiyVw== 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=1774164238; 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=IUrG2PaOGGvRtTYSls6GeO4VPP7D2s+v3lAY9xbCsv3lgRauSnIN/tmEvfJfHcECLgpdzO IDsHotWynsKDZ+4fxLWEzhAjKaACRKzgcqq5OrmixwZ3BkM6WGVzyl7DC0fHVzZugLONeI 4fXfZYBAHvBaZZKkRdXBc3U0Kq4t9E28gC77M2FiepzWAgLeom6G/fwdpAqML7p75rKImV 8hg3vMN2WBhYUDYz+rFGA4W2zxUN9giDmGmap3p2ehiIkoGMRUh+ulaUdksjPG9dErKZoW 9jOou7VniZCe8EN/ZXT43lHbETkAK3fkY9ty4u4g0+F3gDLlnsxMBMUqNVMl4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdnq201xgzpqk for ; Sun, 22 Mar 2026 07:23:58 +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 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: 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")