[NETFILTER]: x_tables: return new table from {arp,ip,ip6}t_register_table()

[~andy/linux] / net / ipv4 / netfilter / iptable_mangle.c

diff --git a/net/ipv4/netfilter/iptable_mangle.c b/net/ipv4/netfilter/iptable_mangle.c
index b4360a69d5ca9cdb979afc2cc16d53bbacd363bb..292f2ed4416f608561d8a84b5cca200debcfa8ed 100644 (file)
--- a/net/ipv4/netfilter/iptable_mangle.c
+++ b/net/ipv4/netfilter/iptable_mangle.c
@@ -21,11 +21,11 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("iptables mangle table");
 
-#define MANGLE_VALID_HOOKS ((1 << NF_IP_PRE_ROUTING) | \
-                           (1 << NF_IP_LOCAL_IN) | \
-                           (1 << NF_IP_FORWARD) | \
-                           (1 << NF_IP_LOCAL_OUT) | \
-                           (1 << NF_IP_POST_ROUTING))
+#define MANGLE_VALID_HOOKS ((1 << NF_INET_PRE_ROUTING) | \
+                           (1 << NF_INET_LOCAL_IN) | \
+                           (1 << NF_INET_FORWARD) | \
+                           (1 << NF_INET_LOCAL_OUT) | \
+                           (1 << NF_INET_POST_ROUTING))
 
 /* Ouch - five different hooks? Maybe this should be a config option..... -- BC */
 static struct
@@ -40,18 +40,18 @@ static struct
                .num_entries = 6,
                .size = sizeof(struct ipt_standard) * 5 + sizeof(struct ipt_error),
                .hook_entry = {
-                       [NF_IP_PRE_ROUTING]     = 0,
-                       [NF_IP_LOCAL_IN]        = sizeof(struct ipt_standard),
-                       [NF_IP_FORWARD]         = sizeof(struct ipt_standard) * 2,
-                       [NF_IP_LOCAL_OUT]       = sizeof(struct ipt_standard) * 3,
-                       [NF_IP_POST_ROUTING]    = sizeof(struct ipt_standard) * 4,
+                       [NF_INET_PRE_ROUTING]   = 0,
+                       [NF_INET_LOCAL_IN]      = sizeof(struct ipt_standard),
+                       [NF_INET_FORWARD]       = sizeof(struct ipt_standard) * 2,
+                       [NF_INET_LOCAL_OUT]     = sizeof(struct ipt_standard) * 3,
+                       [NF_INET_POST_ROUTING]  = sizeof(struct ipt_standard) * 4,
                },
                .underflow = {
-                       [NF_IP_PRE_ROUTING]     = 0,
-                       [NF_IP_LOCAL_IN]        = sizeof(struct ipt_standard),
-                       [NF_IP_FORWARD]         = sizeof(struct ipt_standard) * 2,
-                       [NF_IP_LOCAL_OUT]       = sizeof(struct ipt_standard) * 3,
-                       [NF_IP_POST_ROUTING]    = sizeof(struct ipt_standard) * 4,
+                       [NF_INET_PRE_ROUTING]   = 0,
+                       [NF_INET_LOCAL_IN]      = sizeof(struct ipt_standard),
+                       [NF_INET_FORWARD]       = sizeof(struct ipt_standard) * 2,
+                       [NF_INET_LOCAL_OUT]     = sizeof(struct ipt_standard) * 3,
+                       [NF_INET_POST_ROUTING]  = sizeof(struct ipt_standard) * 4,
                },
        },
        .entries = {
@@ -64,13 +64,14 @@ static struct
        .term = IPT_ERROR_INIT,                 /* ERROR */
 };
 
-static struct xt_table packet_mangler = {
+static struct xt_table __packet_mangler = {
        .name           = "mangle",
        .valid_hooks    = MANGLE_VALID_HOOKS,
        .lock           = RW_LOCK_UNLOCKED,
        .me             = THIS_MODULE,
        .af             = AF_INET,
 };
+static struct xt_table *packet_mangler;
 
 /* The work comes in here from netfilter.c. */
 static unsigned int
@@ -80,7 +81,7 @@ ipt_route_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(skb, hook, in, out, &packet_mangler);
+       return ipt_do_table(skb, hook, in, out, packet_mangler);
 }
 
 static unsigned int
@@ -112,7 +113,7 @@ ipt_local_hook(unsigned int hook,
        daddr = iph->daddr;
        tos = iph->tos;
 
-       ret = ipt_do_table(skb, hook, in, out, &packet_mangler);
+       ret = ipt_do_table(skb, hook, in, out, packet_mangler);
        /* Reroute for ANY change. */
        if (ret != NF_DROP && ret != NF_STOLEN && ret != NF_QUEUE) {
                iph = ip_hdr(skb);
@@ -128,40 +129,40 @@ ipt_local_hook(unsigned int hook,
        return ret;
 }
 
-static struct nf_hook_ops ipt_ops[] = {
+static struct nf_hook_ops ipt_ops[] __read_mostly = {
        {
                .hook           = ipt_route_hook,
                .owner          = THIS_MODULE,
                .pf             = PF_INET,
-               .hooknum        = NF_IP_PRE_ROUTING,
+               .hooknum        = NF_INET_PRE_ROUTING,
                .priority       = NF_IP_PRI_MANGLE,
        },
        {
                .hook           = ipt_route_hook,
                .owner          = THIS_MODULE,
                .pf             = PF_INET,
-               .hooknum        = NF_IP_LOCAL_IN,
+               .hooknum        = NF_INET_LOCAL_IN,
                .priority       = NF_IP_PRI_MANGLE,
        },
        {
                .hook           = ipt_route_hook,
                .owner          = THIS_MODULE,
                .pf             = PF_INET,
-               .hooknum        = NF_IP_FORWARD,
+               .hooknum        = NF_INET_FORWARD,
                .priority       = NF_IP_PRI_MANGLE,
        },
        {
                .hook           = ipt_local_hook,
                .owner          = THIS_MODULE,
                .pf             = PF_INET,
-               .hooknum        = NF_IP_LOCAL_OUT,
+               .hooknum        = NF_INET_LOCAL_OUT,
                .priority       = NF_IP_PRI_MANGLE,
        },
        {
                .hook           = ipt_route_hook,
                .owner          = THIS_MODULE,
                .pf             = PF_INET,
-               .hooknum        = NF_IP_POST_ROUTING,
+               .hooknum        = NF_INET_POST_ROUTING,
                .priority       = NF_IP_PRI_MANGLE,
        },
 };
@@ -171,9 +172,10 @@ static int __init iptable_mangle_init(void)
        int ret;
 
        /* Register table */
-       ret = ipt_register_table(&packet_mangler, &initial_table.repl);
-       if (ret < 0)
-               return ret;
+       packet_mangler = ipt_register_table(&init_net, &__packet_mangler,
+                                           &initial_table.repl);
+       if (IS_ERR(packet_mangler))
+               return PTR_ERR(packet_mangler);
 
        /* Register hooks */
        ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
@@ -183,14 +185,14 @@ static int __init iptable_mangle_init(void)
        return ret;
 
  cleanup_table:
-       ipt_unregister_table(&packet_mangler);
+       ipt_unregister_table(packet_mangler);
        return ret;
 }
 
 static void __exit iptable_mangle_fini(void)
 {
        nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
-       ipt_unregister_table(&packet_mangler);
+       ipt_unregister_table(packet_mangler);
 }
 
 module_init(iptable_mangle_init);