From nobody Mon Aug 7 18:00:13 2023 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 4RKPHK5N63z4m3jN; Mon, 7 Aug 2023 18:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKPHK4t67z3K5S; Mon, 7 Aug 2023 18:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691431213; 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=xmS9o+mVLoPU8fnZZE77RSlzpIU/1xAE2f4XGbxlaAA=; b=yL87TFl5c9pVGWnC7JJPdEk6PINuTUbsPrhwPERvUD1+DPdXCql2pmBCLenXQhaA67ZlHk eJWn2g3ZWi15Zu+f8gIch84UxEJjmNl3CJjjTPxuBEI0Mb/2nDXDrbmQxK0S9cMlLOHZrc a6wG79hy5U+atEoJ3BMTSqVX/8hepy9bSjMKSWIBdbNFwZvm3n83GVDNqDH6IcmYF0tDTe 4NXnC1AJfoFLfJRicidv511NvQOOaI5NZzem/IJlz09RPEIfn7DuU/nPQaKg2oGGoLsIfY Ki/i371Npjo3WHFtYOoA/b/jOnBH3lRbnaq+9CJm+m6vBPyt4WNzv7RWqutQ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691431213; 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=xmS9o+mVLoPU8fnZZE77RSlzpIU/1xAE2f4XGbxlaAA=; b=NQYrUOAz8p5ihUk/xqlBHC4dvEfqfVgaCgQbMBVvDLpbJz7dIfrWD2sGkisqV1mdKPJnhc +qq05JnJ9s0UPv1y4Iiajv1MMrpc2zmxPknFbwxSXh/9jC+SFgh5cZ/Bc526OZzAeeWxtE BcPPs0WbXKDL33lPXhBHqFyO0/zNHyRIkrgDAwQywuWRHxNXJhp+3d/NVK8dVMzx+NUU/3 MeaffvRGtAMkMbLqkIKPqy0r4XlIUWPJxz+FbuSNoSOQqwQsDCrwkkZItnnZG1tobhrkF9 OxQyZG5UDIN6Z39Z4Fjst+NXDojge6swrk6SII0jCgV0eIFwQAn1yXmPH/k/lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691431213; a=rsa-sha256; cv=none; b=m04cku+MQhJbIqfM32UPKCVyrXmFgIGEuXR1sr1Pq6jtuNX48aorKarEgerV0zt2fA0Dq/ MUkM+XjaC/W2JP/m0tRAXWswQPBueltOVm+ZzbYMmi5CEJrTyrzvL9M70j9nNeyYdlpsmi 4F4XdYoKZKOqtEbTrh0svdoY4IVjpQ62I7dYsfaPgwRgRjOZf7sXX8XCwvoiKXfk6LERuG TSZKibSRJZoKOVDnbGEaV6M674T+C8gb//7Iqk91X7bso/UGSavXUQ61cg0fjLSAdARZOa rvo5DhtmnGIiKSAn5N7h4I885pY5l6ki9Z0qlce1T6d2oPLwOLfph0h/BKamwg== 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 4RKPHK3xnFz129N; Mon, 7 Aug 2023 18:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377I0Ddn083870; Mon, 7 Aug 2023 18:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377I0DdJ083864; Mon, 7 Aug 2023 18:00:13 GMT (envelope-from git) Date: Mon, 7 Aug 2023 18:00:13 GMT Message-Id: <202308071800.377I0DdJ083864@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: f8b4f9aab5b7 - main - pfctl: optionally clarify which anchors are layer 3 and which are Ethernet 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: f8b4f9aab5b7119e8e26bc5f75931e89df00df39 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b4f9aab5b7119e8e26bc5f75931e89df00df39 commit f8b4f9aab5b7119e8e26bc5f75931e89df00df39 Author: Kristof Provost AuthorDate: 2023-08-07 17:45:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-07 17:59:50 +0000 pfctl: optionally clarify which anchors are layer 3 and which are Ethernet When listing anchors pfctl lists both 'regular' layer 3 anchors and Ethernet anchors. It's possible to have the same anchor name in both, which can be confusing. Mitigate this a little by explicitly marking where the Ethernet anchors start. Avoid breaking scripts by only doing this at the second level of verbosity. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 09f29b1c601c..ea1812a3858d 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3039,6 +3039,8 @@ main(int argc, char *argv[]) switch (*showopt) { case 'A': pfctl_show_anchors(dev, opts, anchorname); + if (opts & PF_OPT_VERBOSE2) + printf("Ethernet:\n"); pfctl_show_eth_anchors(dev, opts, anchorname); break; case 'r':