From owner-dev-commits-src-main@freebsd.org Mon Apr 26 16:08:43 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E03C15E60EB; Mon, 26 Apr 2021 16:08:43 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTVF75xNtz3nhC; Mon, 26 Apr 2021 16:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD2992350; Mon, 26 Apr 2021 16:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13QG8hGC039914; Mon, 26 Apr 2021 16:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13QG8hiT039913; Mon, 26 Apr 2021 16:08:43 GMT (envelope-from git) Date: Mon, 26 Apr 2021 16:08:43 GMT Message-Id: <202104261608.13QG8hiT039913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 08d77308211f - main - pf tests: Test automatically generated tables 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: 08d77308211f823b8532d27790e8fd29eaf75c77 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 16:08:44 -0000 The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=08d77308211f823b8532d27790e8fd29eaf75c77 commit 08d77308211f823b8532d27790e8fd29eaf75c77 Author: Kristof Provost AuthorDate: 2021-04-26 09:14:44 +0000 Commit: Kristof Provost CommitDate: 2021-04-26 16:08:15 +0000 pf tests: Test automatically generated tables Add a test case where the pfctl optimizer will generate a table automatically. These tables have long names, which we accidentally broke in the nvlist ADDRULE ioctl. Reviewed by: melifaro MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D29989 --- tests/sys/netpfil/pf/table.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 9003f61ba189..5f23a2c82aa9 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -146,9 +146,47 @@ pr251414_cleanup() pft_cleanup } +atf_test_case "automatic" "cleanup" +automatic_head() +{ + atf_set descr "Test automatic - optimizer generated - tables" + atf_set require.user root +} + +automatic_body() +{ + pft_init + + epair=$(vnet_mkepair) + ifconfig ${epair}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair}b + jexec alcatraz ifconfig ${epair}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "block in" \ + "pass in proto icmp from 192.0.2.1" \ + "pass in proto icmp from 192.0.2.3" \ + "pass in proto icmp from 192.0.2.4" \ + "pass in proto icmp from 192.0.2.5" \ + "pass in proto icmp from 192.0.2.6" \ + "pass in proto icmp from 192.0.2.7" \ + "pass in proto icmp from 192.0.2.8" \ + "pass in proto icmp from 192.0.2.9" + + atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2 +} + +automatic_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" atf_add_test_case "pr251414" + atf_add_test_case "automatic" }