lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: nf_ct_udp: merge udpv[4,6]_net_init into udp_net_init

Browse Source 
Merge udpv4_net_init and udpv6_net_init into udp_net_init to
remove redundant code now that we have the u_int16_t proto
parameter.

And use nf_proto_net.users to identify if it's the first time
we use the nf_proto_net, in that case, we initialize it.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Gao feng
2012-06-21 04:36:44 +00:00
committed by Pablo Neira Ayuso
parent efa758fe2c
commit dee7364e0e
1 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
net/netfilter/nf_conntrack_proto_udp.c
View File

@@ -235,10 +235,10 @@ static struct ctl_table udp_compat_sysctl_table[] = {
#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */ #endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
static int udp_kmemdup_sysctl_table(struct nf_proto_net *pn) static int udp_kmemdup_sysctl_table(struct nf_proto_net *pn,
struct nf_udp_net *un)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
struct nf_udp_net *un = (struct nf_udp_net *)pn;
if (pn->ctl_table) if (pn->ctl_table)
return 0; return 0;
pn->ctl_table = kmemdup(udp_sysctl_table, pn->ctl_table = kmemdup(udp_sysctl_table,
@@ -252,11 +252,11 @@ static int udp_kmemdup_sysctl_table(struct nf_proto_net *pn)
return 0; return 0;
} }
static int udp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn) static int udp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn,
struct nf_udp_net *un)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
struct nf_udp_net *un = (struct nf_udp_net *)pn;
pn->ctl_compat_table = kmemdup(udp_compat_sysctl_table, pn->ctl_compat_table = kmemdup(udp_compat_sysctl_table,
sizeof(udp_compat_sysctl_table), sizeof(udp_compat_sysctl_table),
GFP_KERNEL); GFP_KERNEL);
@@ -270,52 +270,33 @@ static int udp_kmemdup_compat_sysctl_table(struct nf_proto_net *pn)
return 0; return 0;
} }
static void udp_init_net_data(struct nf_udp_net *un) static int udp_init_net(struct net *net, u_int16_t proto)
{
int i;
#ifdef CONFIG_SYSCTL
if (!un->pn.ctl_table) {
#else
if (!un->pn.users++) {
#endif
for (i = 0; i < UDP_CT_MAX; i++)
un->timeouts[i] = udp_timeouts[i];
}
}
static int udpv4_init_net(struct net *net, u_int16_t proto)
{ {
int ret; int ret;
struct nf_udp_net *un = udp_pernet(net); struct nf_udp_net *un = udp_pernet(net);
struct nf_proto_net *pn = (struct nf_proto_net *)un; struct nf_proto_net *pn = &un->pn;
udp_init_net_data(un); if (!pn->users) {
int i;
ret = udp_kmemdup_compat_sysctl_table(pn); for (i = 0; i < UDP_CT_MAX; i++)
un->timeouts[i] = udp_timeouts[i];
}
if (proto == AF_INET) {
ret = udp_kmemdup_compat_sysctl_table(pn, un);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = udp_kmemdup_sysctl_table(pn); ret = udp_kmemdup_sysctl_table(pn, un);
#ifdef CONFIG_SYSCTL if (ret < 0)
#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT nf_ct_kfree_compat_sysctl_table(pn);
if (ret < 0) { } else
kfree(pn->ctl_compat_table); ret = udp_kmemdup_sysctl_table(pn, un);
pn->ctl_compat_table = NULL;
}
#endif
#endif
return ret; return ret;
} }
static int udpv6_init_net(struct net *net, u_int16_t proto)
{
struct nf_udp_net *un = udp_pernet(net);
struct nf_proto_net *pn = (struct nf_proto_net *)un;
udp_init_net_data(un);
return udp_kmemdup_sysctl_table(pn);
}
struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly = struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
{ {
.l3proto = PF_INET, .l3proto = PF_INET,
@@ -343,7 +324,7 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4 __read_mostly =
.nla_policy = udp_timeout_nla_policy, .nla_policy = udp_timeout_nla_policy,
}, },
#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
.init_net = udpv4_init_net, .init_net = udp_init_net,
}; };
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp4); EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp4);
@@ -374,6 +355,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6 __read_mostly =
.nla_policy = udp_timeout_nla_policy, .nla_policy = udp_timeout_nla_policy,
}, },
#endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */ #endif /* CONFIG_NF_CT_NETLINK_TIMEOUT */
.init_net = udpv6_init_net, .init_net = udp_init_net,
}; };
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp6); EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_udp6);