Re: git: a9359dcde241 - stable/14 - ipfilter: Add sysctl flag CTLFLAG_TUN to loader tunable

From: Zhenlei Huang <zlei_at_FreeBSD.org>
Date: Mon, 02 Oct 2023 14:32:06 UTC

> On Oct 2, 2023, at 10:53 AM, Cy Schubert <Cy.Schubert@cschubert.com> wrote:
> 
> In message <202310020050.3920omhH029460@gitrepo.freebsd.org>, Zhenlei Huang 
> wri
> tes:
>> The branch stable/14 has been updated by zlei:
>> 
>> URL: https://cgit.FreeBSD.org/src/commit/?id=a9359dcde241f17421a71bc8c96dee08
>> 625db9dd
>> 
>> commit a9359dcde241f17421a71bc8c96dee08625db9dd
>> Author:     Zhenlei Huang <zlei@FreeBSD.org>
>> AuthorDate: 2023-09-29 00:01:43 +0000
>> Commit:     Zhenlei Huang <zlei@FreeBSD.org>
>> CommitDate: 2023-10-02 00:49:38 +0000
>> 
>>    ipfilter: Add sysctl flag CTLFLAG_TUN to loader tunable
>> 
>>    The sysctl variable `net.inet.ipf.large_nat` is actually a loader
>>    tunable. Add sysctl flag CTLFLAG_TUN to it so that `sysctl -T` will
>>    report it correctly.
>> 
>>    No functional change intended.
>> 
>>    Reviewed by:    cy (for #network)
>>    Fixes:          a805ffbcbce8 ipfilter: Make LARGE_NAT a tunable
>>    MFC after:      3 days
>>    Differential Revision:  https://reviews.freebsd.org/D42005
>> 
>>    (cherry picked from commit ba883e7a5ac43b27a373f2b1b0044fd2eb769d4e)
>> ---
>> sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/n
>> etinet/mlfk_ipl.c
>> index 35daad4715bf..69be4abb2485 100644
>> --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
>> +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c
>> @@ -134,7 +134,7 @@ SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_running, CTLFLAG_R
>> D,
>> 	   &VNET_NAME(ipfmain.ipf_running), 0, "IPF is running");
>> SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_chksrc, CTLFLAG_RW, &VNET_NAME(ipfmai
>> n.ipf_chksrc), 0, "");
>> SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_minttl, CTLFLAG_RW, &VNET_NAME(ipfmai
>> n.ipf_minttl), 0, "");
>> -SYSCTL_IPF(_net_inet_ipf, OID_AUTO, large_nat, CTLFLAG_RD, &VNET_NAME(ipfmai
>> n.ipf_large_nat), 0, "large_nat");
>> +SYSCTL_IPF(_net_inet_ipf, OID_AUTO, large_nat, CTLFLAG_RDTUN | CTLFLAG_NOFET
>> CH, &VNET_NAME(ipfmain.ipf_large_nat), 0, "large_nat");
>> 
>> #define CDEV_MAJOR 79
>> #include <sys/poll.h>
>> 
> 
> Can you also please MFC to stable/13 and 12?

Done!

Well, I just have a ( long ) break after MFCing to stable/14 ;)

> 
> 
> -- 
> Cheers,
> Cy Schubert <Cy.Schubert@cschubert.com>
> FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  https://FreeBSD.org
> NTP:           <cy@nwtime.org>    Web:  https://nwtime.org
> 
> 			e^(i*pi)+1=0
> 
> 
> 
> X-BĶ