From nobody Mon Oct 02 09:09:59 2023 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 4RzZsh1BPpz4vq7k; Mon, 2 Oct 2023 09:10:00 +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 4RzZsh0050z4PFG; Mon, 2 Oct 2023 09:09:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696237800; 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=YnuyjxkIkwqPXBwITYh5raIy/+MmD+yzg/vSjg+e+HE=; b=uCV/Q+uaKjWeXh/V3fnXdxbpIybONBCsLCMWljKXJFEFliEuvKkRkuG0APj4oMgOIMdkEB 014zYg+QkwCkdt5CZThCtk3AHmIM6brT/GUVTmMIFyts4qIFS2ObVmbqb27wnaZkPyH8lt vOV1mbo3RfTU/Oly5dAOw4ayBvqrH5peNSj5UmWzzALYrINy8zsdqFF/8rLuJsQoeXNTlT crmUqvB0VhsB2SF5Zf3o33xbYFHJeAmHISACe4Elvbx+dBDVP7PiRhbLI26ECraRL9RTUa XUFo8CD7VzKSlHfrWN/YOvt2QZN1k4KlOn+uEwP/dHVcLS1X1i0prsx/JTXa2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696237800; a=rsa-sha256; cv=none; b=gxvh7gN7fNlFUlseNkwjq5VPL4XockSlwoqQfXrWztsuWBGYF6FLKCMZLIiZzLW8LQ+m/i 0RElGxv5P8ga4NulpI61bHigbs43aQ2yWf15NcyQMc6biXOZNDtS0P41jM8LY6JGN96+lN wj80uwyiBumu9ZBuJv1AF6cGL2+glqrHJixAqXH8vwkkT0MDuH4+sbU8AvjIleIahc5MON K8v2dKNu+GJYP5rJCBCRuerLXkwHKSxVT1G42nfCMui2MECV+gmje08xnWzQfdXwL2mOPF dzy8PpD/0uJ176x/jo6CndtjOngqxOI9MEGbPu2edca3CP6Wb9UCZv4DE2sIiQ== 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=1696237800; 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=YnuyjxkIkwqPXBwITYh5raIy/+MmD+yzg/vSjg+e+HE=; b=GQluYgPMGkgCAd3iPBbMhybX6nFwT2NpOy+h+6xOfPDzwzOTqZIIZIf3boOhELG9nIaUo9 zB5HWex/ozpBM4eSEm7cEwYd0VcwDs6EAfYJhaX18G/9pqH0HZxuCmR6VdLTriGfEqc+ov uVaIw195DGNWCHT2+3T91WEpsvZsChRLtPuSZhnfmCX+CokXkymXHTDv+ocl/eaK3IikdU bq1tCeObC1/uFb5wxOFVhuO9ZrrIaZ5+4sYMuyj6W4f8KkhP644jWbWr848ZSMRXj3xG2E 1eUj5O8St6WDD/cvRm3qt3wzMk7xcmlUI8xsi/X855q8eRiyT53ezqcNGbvCDA== 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 4RzZsg6C9nz15ss; Mon, 2 Oct 2023 09:09:59 +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 39299xWs053791; Mon, 2 Oct 2023 09:09:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39299xb3053788; Mon, 2 Oct 2023 09:09:59 GMT (envelope-from git) Date: Mon, 2 Oct 2023 09:09:59 GMT Message-Id: <202310020909.39299xb3053788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8d6188b13156 - stable/12 - ipfw: Add sysctl flag CTLFLAG_TUN to loader tunables 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8d6188b13156a4b88f7bf230eb0ef8bf38bad551 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8d6188b13156a4b88f7bf230eb0ef8bf38bad551 commit 8d6188b13156a4b88f7bf230eb0ef8bf38bad551 Author: Zhenlei Huang AuthorDate: 2023-09-25 10:10:47 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-02 09:08:54 +0000 ipfw: Add sysctl flag CTLFLAG_TUN to loader tunables The following sysctl variables are actually loader tunables. Add sysctl flag CTLFLAG_TUN to them so that `sysctl -T` will report them correctly. 1. net.inet.ip.fw.enable 2. net.inet6.ip6.fw.enable 3. net.link.ether.ipfw No functional change intended. Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41928 (cherry picked from commit 49197c391b3d49a33bcd08471bf64d533cd10f9d) (cherry picked from commit f5f6da90597cb65ce55c4f17718a200097f6f78f) (cherry picked from commit 09f08dbe248e6ffd031c1eff26aeacef0c6880e9) --- sys/netpfil/ipfw/ip_fw_pfil.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c index ca8a9aa1ba13..084be4a60f05 100644 --- a/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/sys/netpfil/ipfw/ip_fw_pfil.c @@ -96,18 +96,18 @@ SYSBEGIN(f1) SYSCTL_DECL(_net_inet_ip_fw); SYSCTL_PROC(_net_inet_ip_fw, OID_AUTO, enable, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, + CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_SECURE3, &VNET_NAME(fw_enable), 0, ipfw_chg_hook, "I", "Enable ipfw"); #ifdef INET6 SYSCTL_DECL(_net_inet6_ip6_fw); SYSCTL_PROC(_net_inet6_ip6_fw, OID_AUTO, enable, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, + CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_SECURE3, &VNET_NAME(fw6_enable), 0, ipfw_chg_hook, "I", "Enable ipfw+6"); #endif /* INET6 */ SYSCTL_DECL(_net_link_ether); SYSCTL_PROC(_net_link_ether, OID_AUTO, ipfw, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_SECURE3, + CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_SECURE3, &VNET_NAME(fwlink_enable), 0, ipfw_chg_hook, "I", "Pass ether pkts through firewall");