From nobody Tue Oct 3 03:37:24 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 4S03RS4HVSz4vdWT; Tue, 3 Oct 2023 03:37:24 +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 4S03RS2NB4z4Tbx; Tue, 3 Oct 2023 03:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696304244; 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=kh9ovaDRZlRmzp7l7PXxoVpj6gfdKWCQyh9r2+vTrDo=; b=vNLRShU/ARbrM/7RwqXp1QbvekDVesRnrHD8iEvm6lSUIpUon5IbfkSrWPXRf09S4BrjFe +oO0yaIMYNVvSWS84FPd9wIkI5K4P3dnXJDOvcm0WmgYpWcKo1WSIbdtZI5wfDaZNDcKJd qkzbluZ788H1Z6W1iK1CCTUFChufFL588j7Q+P2r2oDOr+eoFwmhKfWf8YOvPuJe7XbW2Z sxiXHhFG8Sf+D8t+1iDsbP4zd2kM//sf4wwAAhjEbFkQtZew9vgQrE9TM8WxTxVGq3y62B 0Xml/PnZ1e2ucY4OtrqhRAvOzbTA2cRu3LWXUNYOeaLXZm8nN2VWMGUHGfJ3sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696304244; a=rsa-sha256; cv=none; b=XuuicP94MCKw21tUNMUzfhJenxBwyJi4di+xNsqUpxW9ZqsfEJMAEwRX9w634Pu9Tq3Rfv wZjVY5qlPjTeLQWqRRKf+FBBN8DaiF6zxKLlZelu52NT8tzMIsbR4uBeqm3hS0pWIEshc2 7WqF52dTAuPeqPnB2S6rSvDuGQsKCjAr+OAN7t25iBz9fkvenpfl4K+cpRS1pYxDr8W9kf Osi7+V4H/EMjRyuKzKpLsIHAn5zjSwR7Yy3Qpvok3S06Y9UFmtoDd8NqBC8GOiAR+9grdp Yo9PCxyEOi5k2vAkZKgdPBUmI1Ptxy/dLuw+oneS3Q03jblyaArxoa74nnRpPw== 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=1696304244; 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=kh9ovaDRZlRmzp7l7PXxoVpj6gfdKWCQyh9r2+vTrDo=; b=cRjwqHdefdu5Dy48xmMkXTIw+FsG3Ei3k6ztJcnkB3MpZI1SDbKm7/zsmY0bSG5LGqaEyQ As3/SMS6OK29lvBeuqLvV/3HXkxuUV48smozaZfZDsk1QImxi7YbwybxJkq1uTCJLfacFP rOWmzSn1Pd6n+k4F0WiG+bDu2Ef8xm2D47Ln676Y5XlzPfs8c+IE33Xl2ZeCGZ/Q1oj19J EuTMrGeZxe00xYxb9TLFMuKXYCm09BLNqOdPgj0XF7lf11gcCwIJ+sNpcEi/07LZTcAWtE 4JUbFH1qw2xq8lksHI4xQWDUmOb5STdpsnqJU1fifj6YdbZT/752Dnyj2oPkBQ== 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 4S03RS1NZfzfLd; Tue, 3 Oct 2023 03:37:24 +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 3933bOk7003036; Tue, 3 Oct 2023 03:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3933bOge003033; Tue, 3 Oct 2023 03:37:24 GMT (envelope-from git) Date: Tue, 3 Oct 2023 03:37:24 GMT Message-Id: <202310030337.3933bOge003033@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: e19407fe9a63 - releng/14.0 - 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: e19407fe9a63a16a5e8c6a0ad94e325d5289d301 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e19407fe9a63a16a5e8c6a0ad94e325d5289d301 commit e19407fe9a63a16a5e8c6a0ad94e325d5289d301 Author: Zhenlei Huang AuthorDate: 2023-09-25 10:10:47 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-03 03:34:16 +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 Approved by: re (gjb) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41928 (cherry picked from commit 49197c391b3d49a33bcd08471bf64d533cd10f9d) (cherry picked from commit f5f6da90597cb65ce55c4f17718a200097f6f78f) --- 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 1cfff1870d7f..4dae28aa0544 100644 --- a/sys/netpfil/ipfw/ip_fw_pfil.c +++ b/sys/netpfil/ipfw/ip_fw_pfil.c @@ -91,20 +91,20 @@ 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 | CTLFLAG_NEEDGIANT, &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 | CTLFLAG_NEEDGIANT, &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 | CTLFLAG_NEEDGIANT, &VNET_NAME(fwlink_enable), 0, ipfw_chg_hook, "I", "Pass ether pkts through firewall");