|
@@ -26,7 +26,7 @@ static struct
|
|
|
struct ip6t_replace repl;
|
|
|
struct ip6t_standard entries[3];
|
|
|
struct ip6t_error term;
|
|
|
-} initial_table __initdata = {
|
|
|
+} initial_table __net_initdata = {
|
|
|
.repl = {
|
|
|
.name = "filter",
|
|
|
.valid_hooks = FILTER_VALID_HOOKS,
|
|
@@ -51,14 +51,13 @@ static struct
|
|
|
.term = IP6T_ERROR_INIT, /* ERROR */
|
|
|
};
|
|
|
|
|
|
-static struct xt_table __packet_filter = {
|
|
|
+static struct xt_table packet_filter = {
|
|
|
.name = "filter",
|
|
|
.valid_hooks = FILTER_VALID_HOOKS,
|
|
|
.lock = RW_LOCK_UNLOCKED,
|
|
|
.me = THIS_MODULE,
|
|
|
.af = AF_INET6,
|
|
|
};
|
|
|
-static struct xt_table *packet_filter;
|
|
|
|
|
|
/* The work comes in here from netfilter.c. */
|
|
|
static unsigned int
|
|
@@ -68,7 +67,7 @@ ip6t_hook(unsigned int hook,
|
|
|
const struct net_device *out,
|
|
|
int (*okfn)(struct sk_buff *))
|
|
|
{
|
|
|
- return ip6t_do_table(skb, hook, in, out, packet_filter);
|
|
|
+ return ip6t_do_table(skb, hook, in, out, init_net.ipv6.ip6table_filter);
|
|
|
}
|
|
|
|
|
|
static unsigned int
|
|
@@ -88,7 +87,7 @@ ip6t_local_out_hook(unsigned int hook,
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
- return ip6t_do_table(skb, hook, in, out, packet_filter);
|
|
|
+ return ip6t_do_table(skb, hook, in, out, init_net.ipv6.ip6table_filter);
|
|
|
}
|
|
|
|
|
|
static struct nf_hook_ops ip6t_ops[] __read_mostly = {
|
|
@@ -119,6 +118,26 @@ static struct nf_hook_ops ip6t_ops[] __read_mostly = {
|
|
|
static int forward = NF_ACCEPT;
|
|
|
module_param(forward, bool, 0000);
|
|
|
|
|
|
+static int __net_init ip6table_filter_net_init(struct net *net)
|
|
|
+{
|
|
|
+ /* Register table */
|
|
|
+ net->ipv6.ip6table_filter =
|
|
|
+ ip6t_register_table(net, &packet_filter, &initial_table.repl);
|
|
|
+ if (IS_ERR(net->ipv6.ip6table_filter))
|
|
|
+ return PTR_ERR(net->ipv6.ip6table_filter);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static void __net_exit ip6table_filter_net_exit(struct net *net)
|
|
|
+{
|
|
|
+ ip6t_unregister_table(net->ipv6.ip6table_filter);
|
|
|
+}
|
|
|
+
|
|
|
+static struct pernet_operations ip6table_filter_net_ops = {
|
|
|
+ .init = ip6table_filter_net_init,
|
|
|
+ .exit = ip6table_filter_net_exit,
|
|
|
+};
|
|
|
+
|
|
|
static int __init ip6table_filter_init(void)
|
|
|
{
|
|
|
int ret;
|
|
@@ -131,10 +150,9 @@ static int __init ip6table_filter_init(void)
|
|
|
/* Entry 1 is the FORWARD hook */
|
|
|
initial_table.entries[1].target.verdict = -forward - 1;
|
|
|
|
|
|
- /* Register table */
|
|
|
- packet_filter = ip6t_register_table(&init_net, &__packet_filter, &initial_table.repl);
|
|
|
- if (IS_ERR(packet_filter))
|
|
|
- return PTR_ERR(packet_filter);
|
|
|
+ ret = register_pernet_subsys(&ip6table_filter_net_ops);
|
|
|
+ if (ret < 0)
|
|
|
+ return ret;
|
|
|
|
|
|
/* Register hooks */
|
|
|
ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
|
|
@@ -144,14 +162,14 @@ static int __init ip6table_filter_init(void)
|
|
|
return ret;
|
|
|
|
|
|
cleanup_table:
|
|
|
- ip6t_unregister_table(packet_filter);
|
|
|
+ unregister_pernet_subsys(&ip6table_filter_net_ops);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
static void __exit ip6table_filter_fini(void)
|
|
|
{
|
|
|
nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
|
|
|
- ip6t_unregister_table(packet_filter);
|
|
|
+ unregister_pernet_subsys(&ip6table_filter_net_ops);
|
|
|
}
|
|
|
|
|
|
module_init(ip6table_filter_init);
|