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

netfilter: netns nat: per-netns NAT table

Browse Source 
Same story as with iptable_filter, iptables_raw tables.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
Alexey Dobriyan
2008-10-08 11:35:10 +02:00
committed by Patrick McHardy
parent b8b8063e0d
commit e099a17357
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/netns/ipv4.h
View File

@@ -38,6 +38,7 @@ struct netns_ipv4 {
struct xt_table *iptable_raw; struct xt_table *iptable_raw;
struct xt_table *arptable_filter; struct xt_table *arptable_filter;
struct xt_table *iptable_security; struct xt_table *iptable_security;
struct xt_table *nat_table;
#endif #endif
int sysctl_icmp_echo_ignore_all; int sysctl_icmp_echo_ignore_all;

40
net/ipv4/netfilter/nf_nat_rule.c
View File

@@ -33,7 +33,7 @@ static struct
struct ipt_replace repl; struct ipt_replace repl;
struct ipt_standard entries[3]; struct ipt_standard entries[3];
struct ipt_error term; struct ipt_error term;
} nat_initial_table __initdata = { } nat_initial_table __net_initdata = {
.repl = { .repl = {
.name = "nat", .name = "nat",
.valid_hooks = NAT_VALID_HOOKS, .valid_hooks = NAT_VALID_HOOKS,
@@ -58,14 +58,13 @@ static struct
.term = IPT_ERROR_INIT, /* ERROR */ .term = IPT_ERROR_INIT, /* ERROR */
}; };
static struct xt_table __nat_table = { static struct xt_table nat_table = {
.name = "nat", .name = "nat",
.valid_hooks = NAT_VALID_HOOKS, .valid_hooks = NAT_VALID_HOOKS,
.lock = __RW_LOCK_UNLOCKED(__nat_table.lock), .lock = __RW_LOCK_UNLOCKED(__nat_table.lock),
.me = THIS_MODULE, .me = THIS_MODULE,
.af = AF_INET, .af = AF_INET,
}; };
static struct xt_table *nat_table;
/* Source NAT */ /* Source NAT */
static unsigned int ipt_snat_target(struct sk_buff *skb, static unsigned int ipt_snat_target(struct sk_buff *skb,
@@ -194,9 +193,10 @@ int nf_nat_rule_find(struct sk_buff *skb,
const struct net_device *out, const struct net_device *out,
struct nf_conn *ct) struct nf_conn *ct)
{ {
struct net *net = nf_ct_net(ct);
int ret; int ret;
ret = ipt_do_table(skb, hooknum, in, out, nat_table); ret = ipt_do_table(skb, hooknum, in, out, net->ipv4.nat_table);
if (ret == NF_ACCEPT) { if (ret == NF_ACCEPT) {
if (!nf_nat_initialized(ct, HOOK2MANIP(hooknum))) if (!nf_nat_initialized(ct, HOOK2MANIP(hooknum)))
@@ -226,14 +226,32 @@ static struct xt_target ipt_dnat_reg __read_mostly = {
.family = AF_INET, .family = AF_INET,
}; };
static int __net_init nf_nat_rule_net_init(struct net *net)
{
net->ipv4.nat_table = ipt_register_table(net, &nat_table,
&nat_initial_table.repl);
if (IS_ERR(net->ipv4.nat_table))
return PTR_ERR(net->ipv4.nat_table);
return 0;
}
static void __net_exit nf_nat_rule_net_exit(struct net *net)
{
ipt_unregister_table(net->ipv4.nat_table);
}
static struct pernet_operations nf_nat_rule_net_ops = {
.init = nf_nat_rule_net_init,
.exit = nf_nat_rule_net_exit,
};
int __init nf_nat_rule_init(void) int __init nf_nat_rule_init(void)
{ {
int ret; int ret;
nat_table = ipt_register_table(&init_net, &__nat_table, ret = register_pernet_subsys(&nf_nat_rule_net_ops);
&nat_initial_table.repl); if (ret != 0)
if (IS_ERR(nat_table)) goto out;
return PTR_ERR(nat_table);
ret = xt_register_target(&ipt_snat_reg); ret = xt_register_target(&ipt_snat_reg);
if (ret != 0) if (ret != 0)
goto unregister_table; goto unregister_table;
@@ -247,8 +265,8 @@ int __init nf_nat_rule_init(void)
unregister_snat: unregister_snat:
xt_unregister_target(&ipt_snat_reg); xt_unregister_target(&ipt_snat_reg);
unregister_table: unregister_table:
ipt_unregister_table(nat_table); unregister_pernet_subsys(&nf_nat_rule_net_ops);
out:
return ret; return ret;
} }
@@ -256,5 +274,5 @@ void nf_nat_rule_cleanup(void)
{ {
xt_unregister_target(&ipt_dnat_reg); xt_unregister_target(&ipt_dnat_reg);
xt_unregister_target(&ipt_snat_reg); xt_unregister_target(&ipt_snat_reg);
ipt_unregister_table(nat_table); unregister_pernet_subsys(&nf_nat_rule_net_ops);
} }