Commit 67f28216 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: move autoassign_helper sysctl to net_generic data 



While at it, make it an u8, no need to use an integer for a boolean.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 098b5d35

include/net/netfilter/nf_conntrack.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ union nf_conntrack_expect_proto { 


struct nf_conntrack_net {

	/* only used when new connection is allocated: */

	u8 sysctl_auto_assign_helper;

	bool auto_assign_helper_warned;



	/* only used from work queues, configuration plane, and so on: */

net/netfilter/nf_conntrack_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ nf_ct_lookup_helper(struct nf_conn *ct, struct net *net) 
{

	struct nf_conntrack_net *cnet = net_generic(net, nf_conntrack_net_id);



	if (!net->ct.sysctl_auto_assign_helper) {

	if (!cnet->sysctl_auto_assign_helper) {

		if (cnet->auto_assign_helper_warned)

			return NULL;

		if (!__nf_ct_helper_find(&ct->tuplehash[IP_CT_DIR_REPLY].tuple))
@@ -560,7 +560,9 @@ static const struct nf_ct_ext_type helper_extend = { 


void nf_conntrack_helper_pernet_init(struct net *net)

{

	net->ct.sysctl_auto_assign_helper = nf_ct_auto_assign_helper;

	struct nf_conntrack_net *cnet = net_generic(net, nf_conntrack_net_id);



	cnet->sysctl_auto_assign_helper = nf_ct_auto_assign_helper;

}



int nf_conntrack_helper_init(void)

net/netfilter/nf_conntrack_standalone.c

+3 −4
Original line number Diff line number Diff line
@@ -662,10 +662,9 @@ static struct ctl_table nf_ct_sysctl_table[] = { 
	},

	[NF_SYSCTL_CT_HELPER] = {

		.procname	= "nf_conntrack_helper",

		.data		= &init_net.ct.sysctl_auto_assign_helper,

		.maxlen		= sizeof(int),

		.maxlen		= sizeof(u8),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.proc_handler	= proc_dou8vec_minmax,

		.extra1 	= SYSCTL_ZERO,

		.extra2 	= SYSCTL_ONE,

	},
@@ -1042,7 +1041,7 @@ static int nf_conntrack_standalone_init_sysctl(struct net *net) 
	table[NF_SYSCTL_CT_CHECKSUM].data = &net->ct.sysctl_checksum;

	table[NF_SYSCTL_CT_LOG_INVALID].data = &net->ct.sysctl_log_invalid;

	table[NF_SYSCTL_CT_ACCT].data = &net->ct.sysctl_acct;

	table[NF_SYSCTL_CT_HELPER].data = &net->ct.sysctl_auto_assign_helper;

	table[NF_SYSCTL_CT_HELPER].data = &cnet->sysctl_auto_assign_helper;

#ifdef CONFIG_NF_CONNTRACK_EVENTS

	table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events;

#endif