From nobody Mon Sep 25 10:12:29 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 4RvJb16grkz4vLSt; Mon, 25 Sep 2023 10:12:29 +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 4RvJb14Y3wz3DwN; Mon, 25 Sep 2023 10:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695636749; 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=G5714zCqHW8dvt3Ftsl2zlSmBM5pXLULWht2JQMz8cQ=; b=O8a+yWApxuaYE8dV6j5NRg9riS+pS2QScfc9CPnCrzk31thWDqN2rUwigY/jqQpOh0AG2N FXK2pA+75nWGcPK5ch2iA+mpCRut9424XvomvlAf0WaE3xN2ndwUo0tf2pe1c3+Ini44uS B8umiGQte/pSa3A3F8/aOhrxznYDtTMWDQDG8171H66yk4tsWPzwXZ/FuymBpXf9G0RZZ+ iUlPVQSzjlplapFYCKjxyCn1aA3U0eiYxtseUk1qgAdWkXxOa724/H1HauCmY82o+cbnpd DS5z926w816MOifR0xDkhkt1usy1L+5gDxxrCxXuiMh6b7fLv6OOPWNIXqM04A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695636749; a=rsa-sha256; cv=none; b=tt0CgE9PhwGeXEJx6LOMa3iTGRCnHCPu4oDr1ZC3cwril8Qo9WkjCGY++W87FjpTA4Q32b CipQv3//8z6ql6IMp7JCDh78aD7v8hJCAN70bDP4g27mXguVenDZPS0zvdYftNLp0v3gMr eok1sIQZMwIdwzDKbYnd6KeHuxhSbha8YYG0CQuz1qemWrHf+ZcAGzK3W9/D35Vff6Uo+q Tm7wB1X6m9bo7V/QW9MZDRjQqXgLeEHCVfNF6xp2owyKW4pUa7a9yW5aY3pzm3h9ESr3ml pZYOU7STt6ESKSv6rIJGu9aCe0g9fsxa4NZWTMkGK1lM96Htss19zJOrCgbcEQ== 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=1695636749; 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=G5714zCqHW8dvt3Ftsl2zlSmBM5pXLULWht2JQMz8cQ=; b=i6KlzehCB32Qk4GKyJSP1SmUfrshd+IeCbA1SkenL6wHSTmRMPzsH4XIrL30Vi9Hbhuv77 15VwcT+mbcxs8DwEBnp/+mcvwVoDLwLm7HEUdTDtP69ODwDNsI+T1OM7nozaGS9cn6s0tQ GEnGJhGcHRRn2Sf2QD9tsqJuk/xfM8LVB9di3ieKH59yu+es7kEIFW1YcHSnF0UZ/UmdHh 48pyLjpOkpAS/q6bqRzy+debiY0LjkPFONJ4dpyU3/JKv5T/B5k9jeDzj+KDyKpYaRJBtS 5KyEfWy1F0uH1uXzMnXM4/rB63Jkpdow1H5pucHJm5gwOKi6/iLfsQwqh6esvA== 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 4RvJb13X34z1PCZ; Mon, 25 Sep 2023 10:12:29 +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 38PACT1u075588; Mon, 25 Sep 2023 10:12:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PACTt9075585; Mon, 25 Sep 2023 10:12:29 GMT (envelope-from git) Date: Mon, 25 Sep 2023 10:12:29 GMT Message-Id: <202309251012.38PACTt9075585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 49197c391b3d - main - ipfw: Add sysctl flag CTLFLAG_TUN to loader tunables 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49197c391b3d49a33bcd08471bf64d533cd10f9d Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=49197c391b3d49a33bcd08471bf64d533cd10f9d commit 49197c391b3d49a33bcd08471bf64d533cd10f9d Author: Zhenlei Huang AuthorDate: 2023-09-25 10:10:47 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-25 10:10:47 +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 --- 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");