From nobody Wed Mar 30 09:17:25 2022 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 A4FB91A34A7E; Wed, 30 Mar 2022 09:17:26 +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 4KT16Y6LZzz3GnY; Wed, 30 Mar 2022 09:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648631846; 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=Q+f1uPAm202Tbx6T+fkAJuEqX6JXJ0njny+7GZamTXw=; b=a5bJxPh/+8nqgP8spOrCiYxYk5pXtHWmL8dSK72t/cmIYWmOCqY2n9f0d1qAp86uXgP2wx fumJc12fXuPPL5dezOvSiUpI1bt0ZSbYEWqdScFgvZOrAlLOgb3vy+OzVcAXaiqllCFxtX pMUSMi0eR7Z8eD0n+1dyFgSKkdEAaprwKkRRi/DW9HUnmjwuIir2B4/E1g5OJh9qAXVuDL ZzLUFfOhyExOfsG5S7lmIxhdBw7+6cUY90r2x0LQD9UeXDNmC8sxO5APlFJ4PJh+ia4UcG 7dSSomttFikavvdlNdNx4G694lorMK7Y10GcIPH/oMMGFrRwwk5IjmETxWN1CQ== 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 A93B0108A4; Wed, 30 Mar 2022 09:17:25 +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 22U9HPbM091052; Wed, 30 Mar 2022 09:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22U9HPxK091051; Wed, 30 Mar 2022 09:17:25 GMT (envelope-from git) Date: Wed, 30 Mar 2022 09:17:25 GMT Message-Id: <202203300917.22U9HPxK091051@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: d27c9f5bc38e - main - pf: fixup match 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: d27c9f5bc38eda519145092c13bca2823a9998d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648631846; 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=Q+f1uPAm202Tbx6T+fkAJuEqX6JXJ0njny+7GZamTXw=; b=YOQz1WukabN4Ta36VbgBbRKo3VoVxxFT0FbjsJpoTpZrKU66ZT8H00+X8cimv+owLA5Uqd jSEX2v1hYoilY1bcO7z04JgRol/CKG/t0cEm7orf5a5kUBLfZIly2zDHt6PHXVLRJafXTO 6BMpqdjHr2cH5zaH5OR6bRB0MJZgsH/f5ZZB2bKDqj6vOzA+FVOhaqoo+OCJzuAtPlQ2sR tpwLBGFTLSUM0oCvzYkuE8DFAW4fvQmDwpWCzvcE90wakprRugYXGi7rquMTwDLBe/maUk DdIPShLwUNz7c+tfu/ndJ+jRYbJ7R3OEA+7nic4ngXcqhB/u1Tb1NpzfQyOzrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648631846; a=rsa-sha256; cv=none; b=ax/D3Laj5lOcoiMAvl78yzqTue6L6exVCr1gRUU+8fYYhqkKGtn/d/wfFE2cK1D9j65Dkk gm1RdpUA7wbGx+4zbE3aDlEzNG2M9rQ5QFj01r5+H5c1dwMU9WlDkaU6hXy+2yX+SGNjTe AeOfYqWqmfU3oyfkn/44gdG3hz1safISChmNjcg76AWdZK9/zfQ9cQXxyNXC66O9fEAiEY a83QGbfjpj4PIY0ipCEBSmxXwJaUx0YVHBRFB9+zCdhrsLj+X1Hn6JrkJ7IdsIyBNdY/51 87jVj+PYQV8GDxzlJf9a+YvZx8yCh59FHllFgOBbTN4xAgkRhPC6eCW9Ri2uJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d27c9f5bc38eda519145092c13bca2823a9998d8 commit d27c9f5bc38eda519145092c13bca2823a9998d8 Author: Kristof Provost AuthorDate: 2022-03-29 12:28:37 +0000 Commit: Kristof Provost CommitDate: 2022-03-30 08:28:19 +0000 pf: fixup match rules Ensure that we can set and print match rules in ethernet rules. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 3 ++- sys/netpfil/pf/pf_nv.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index b6d1ebc127e1..1bd95b076ce6 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -744,7 +744,8 @@ void print_eth_rule(struct pfctl_eth_rule *r, const char *anchor_call, int rule_numbers) { - static const char *actiontypes[] = { "pass", "block" }; + static const char *actiontypes[] = { "pass", "block", "", "", "", "", + "", "", "", "", "", "", "match" }; if (rule_numbers) printf("@%u ", r->nr); diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index 0a79dfb0de7a..85666a5ee111 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -1170,7 +1170,8 @@ pf_nveth_rule_to_keth_rule(const nvlist_t *nvl, PFNV_CHK(pf_nvuint8(nvl, "action", &krule->action)); - if (krule->action != PF_PASS && krule->action != PF_DROP) + if (krule->action != PF_PASS && krule->action != PF_DROP && + krule->action != PF_MATCH) return (EBADMSG); errout: