From nobody Wed Feb 12 19:39:12 2025 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 4YtTCP30Ssz5nGWM; Wed, 12 Feb 2025 19:39:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtTCN3hZMz3Xqh; Wed, 12 Feb 2025 19:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389152; 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=Hg6gh9GmlRtOvH08l92xtWc8qgcIXQS1ULbCOJgBhJk=; b=B9SdFOLsaDDbDd2WOoKudHlrz3X9hjqwJVNmy44VzblXZnp/bEsn6joBAv6eiFjVX+QLgo OIdFlAOwAcZdjO+sPqzZxn8anBR9TC0/vwqv6QwWw4yXvsqeWtDKOP/Z9W3P+1OXDIw17B 8rgfvcfCWoA7esWlzncIGd+MgZJupt41V46Mh/jqL6VoMjOC1Odb+smTBjpOT/gMF9ZC9t juiZWsh0OkkXeDu4sOC9tJbMWerRxsAr4LhfgDscFP7/lasytk8Znz26/3iGSSTSogRRoo alFbgbCXM54Y1AzUR1uXcrNEvGM1X3yIvFFwkrA7vwSVSM0PpeMBcwze1ifOQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389152; 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=Hg6gh9GmlRtOvH08l92xtWc8qgcIXQS1ULbCOJgBhJk=; b=yIdkcYmk5hK6A/2c/hyLTPUZNBDWDXkiaYbPfUwN618ZAce9fidjOZTxi5M6OHZIN7SqpK KMqEZ2SRqA6YpsWBSf3M8WgICoxa4TJ93i0U1yd1L9b2bztLOM0femKoVf105mJ7gzB+IQ Gd6fKVKsBSVgr8tEDBVN22ZSw7Il/oi1F6AVB59K+KpZKgG34PHtFS2XTdyEmXEhs+kW0Y djr6m5wBCc05ag5UWH3zXcFtoKJG7k7cfZzCwh+bj171YuNLicKJQPDrcu8Q1VrqA6/6Sv dbsCLAQnTi2oXu/DVJKz6gI3CIykx6aF/FThN+p/Q+sI6Ea8k+BtIKGvZkHDXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389152; a=rsa-sha256; cv=none; b=E4BzOG4gylQ3ol4RFEIDdo4s+9jO/2oZ8lXoqZVgTx4DqQ4oyyELrKrElQVhYh9toKqQh+ EqYspVPvhgHdl1G9S2yhYsSiOlYSpK/TcuTwjUWAAbFuSHN1unbyNrBHPUYmRILpNoRqmZ UxCEtsgGbauVLUNEBpeK0SDLwT3Z1H7HzWFZyyW+On4vO0lIa0zQ0VoHVARK4qG784Hklc t4Sjb9/ayj54tp7KgA/n5mtO1P//3kNZjWd3LZaqqEor1oo/v4f4O8IWysjv7uEaRl0VQ6 hdTICtPYsiMHdaZG+BrX4lsktRToDWqzTnN7bxnHpo1p02qoeYWFJXr1vOzQow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YtTCN2zTmz1BRc; Wed, 12 Feb 2025 19:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CJdCCd061810; Wed, 12 Feb 2025 19:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJdCWW061807; Wed, 12 Feb 2025 19:39:12 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:12 GMT Message-Id: <202502121939.51CJdCWW061807@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: d11a19654aab - main - pf tests: verify that table counters work on match rules 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: d11a19654aab578fad617fe8676146b2734b1679 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d11a19654aab578fad617fe8676146b2734b1679 commit d11a19654aab578fad617fe8676146b2734b1679 Author: Kristof Provost AuthorDate: 2025-02-06 18:27:19 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:39 +0000 pf tests: verify that table counters work on match rules Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/table.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index f655463f3c03..3b7e116720f3 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -109,6 +109,46 @@ v6_counters_cleanup() pft_cleanup } +atf_test_case "match_counters" "cleanup" +match_counters_head() +{ + atf_set descr 'Test that counters for tables in match rules work' + atf_set require.user root +} + +match_counters_body() +{ + pft_init + + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1 }" \ + "pass all" \ + "match in from to any" \ + "match out from any to " \ + "set skip on lo" + + atf_check -s exit:0 -o ignore ping -c 3 192.0.2.2 + + atf_check -s exit:0 -e ignore \ + -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv +} + +match_counters_cleanup() +{ + pft_cleanup +} + atf_test_case "zero_one" "cleanup" zero_one_head() { @@ -488,6 +528,7 @@ atf_init_test_cases() { atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" + atf_add_test_case "match_counters" atf_add_test_case "zero_one" atf_add_test_case "reset_nonzero" atf_add_test_case "pr251414"