From nobody Sun Mar 22 06:02:34 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 4fdm166jtBz6W1rN for ; Sun, 22 Mar 2026 06:02:34 +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 4fdm165yz9z3PpL for ; Sun, 22 Mar 2026 06:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774159354; 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=CmbMpddH4hjkGc2mZy+cR4MAQgf954dTzIn52B3FWw8=; b=CRY8hMx7V/0kuAIokWuQzrCNvVv2WIu52xhfkDUr/SOQ6Cio9l+bhuwwb0dnySVo/qTl2j yay8qnNT9du7JHcWKZi7WId11RjiRz4crbPJIdWt1jPCRpawv/w14uZK1HERZx3EhqpiyL Pfk10CwUgetw55DGQGpgnzlEc46nreLuV5ES1hn42o+A33ccfePCZ3s+ptQpnMJxRpsgEt SS0fqpYG0C8AsTM2FwhtoO+GhREXrEnicLtepe+lLD/9RjyTEUtwvr+XhMoxrL9FtfGnwT v+gnD9sr8VvJxutNVtzVkC2rOFU2i8aik4spGkKhbg4OFriSZBIS8rSkIa0O9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774159354; a=rsa-sha256; cv=none; b=TVJApMlAC0WXGgL2tlgE+XovZAMQg+Y4yC+3Cs9cvGojiSYwLQs/T8EG/QM4fq1TJc/l6J ldbXr3dAIIpmTt8AcIZc/LWvgA6WY3WDVLjUivh+atY7bHkVAHBprgqP8D/Rz7MLjYSbk4 Lme4EdlTlvgnuJ0Re6VX01hHt6ODVU9yEYpRx9zH/m4NH4BAJCCReoAgNdedv3MdsziQvG RTTX1Rh3QHJ0e1Pm/EkymJjBnw+rUQhBNJ2DlfQV1S9Vh93PsBYEQUUwaMTDBmGe5Mz6Gx IS5g4yqxSet4wTLNn5TYFafL1Z2VFB+v2RoZM7J6pfaqIG/8PcXeXhhueqJ1fQ== 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=1774159354; 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=CmbMpddH4hjkGc2mZy+cR4MAQgf954dTzIn52B3FWw8=; b=HJjELXIR+BqcusWYzrNt3QNQS8ANLTTf89eo0z9AmIL6M0kZPcLrKxYEjtkH/6Y68NmFfj x3dqheWHNa6Wdy5dZhKOw6lBNGNKboqxWLQcESl/Odwr1u5WelL36P4aMS6W3FIXehIHDi GCOIkNNzN7HXssLtRgeVm8MpossebcaIXtsP0yuBkUCZtquKw1uJVvJI/2Jb7GYNcyZwhb 5Fmncgm9TsmNiNNN2UMVU+oBHAZ0yWFqs5WPyL/vmAJZbNVaUsIjF4SYhWFIM8izzDpXRh xKTFwRNDmQ85RKta0BXTqIjs02NY35AP0q7tUhcM2VKspzSeQTrPZQ1qUkg1dQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdm165K6Czn3f for ; Sun, 22 Mar 2026 06:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 22 Mar 2026 06:02:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0b0d34fd2f40 - main - pf tests: verify first-match-wins for nat rules 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: 0b0d34fd2f40e06e4600441b15b26b1cc1941c9f Auto-Submitted: auto-generated Date: Sun, 22 Mar 2026 06:02:34 +0000 Message-Id: <69bf85fa.347bf.2555cd35@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0b0d34fd2f40e06e4600441b15b26b1cc1941c9f commit 0b0d34fd2f40e06e4600441b15b26b1cc1941c9f Author: Kristof Provost AuthorDate: 2026-03-20 03:16:57 +0000 Commit: Kristof Provost CommitDate: 2026-03-22 03:47:36 +0000 pf tests: verify first-match-wins for nat rules Sponsored by: Orange Business Services --- tests/sys/netpfil/pf/nat.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/sys/netpfil/pf/nat.sh b/tests/sys/netpfil/pf/nat.sh index 025471f75f97..600688a8dbc9 100644 --- a/tests/sys/netpfil/pf/nat.sh +++ b/tests/sys/netpfil/pf/nat.sh @@ -953,6 +953,50 @@ dummynet_mask_cleanup() pft_cleanup } +atf_test_case "first_match" "cleanup" +first_match_head() +{ + atf_set descr 'Test that NAT rules are first match' + atf_set require.user root +} + +first_match_body() +{ + pft_init + + epair_nat=$(vnet_mkepair) + epair_echo=$(vnet_mkepair) + + vnet_mkjail nat ${epair_nat}b ${epair_echo}a + vnet_mkjail echo ${epair_echo}b + + ifconfig ${epair_nat}a 192.0.2.2/24 up + route add -net 198.51.100.0/24 192.0.2.1 + + jexec nat ifconfig ${epair_nat}b 192.0.2.1/24 up + jexec nat ifconfig ${epair_echo}a 198.51.100.1/24 up + jexec nat sysctl net.inet.ip.forwarding=1 + + jexec echo ifconfig ${epair_echo}b 198.51.100.2/24 up + + # Enable pf! + jexec nat pfctl -e + pft_set_rules nat \ + "table { 192.0.2.0/24 }" \ + "nat on ${epair_echo}a inet from to any -> 198.51.100.1" \ + "nat on ${epair_echo}a inet from 192.0.2.0/24 to any -> 198.51.100.3" + + atf_check -s exit:0 -o ignore ping -c 3 198.51.100.2 + atf_check -s exit:0 -e ignore \ + -o match:"all icmp 198.51.100.1:.*(192.0.2.2:.*) -> 198.51.100.2:8.*" \ + jexec nat pfctl -ss +} + +first_match_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "exhaust" @@ -975,4 +1019,5 @@ atf_init_test_cases() atf_add_test_case "binat_match" atf_add_test_case "empty_pool" atf_add_test_case "dummynet_mask" + atf_add_test_case "first_match" }