fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / ipv6 / netfilter / ip6table_raw.c

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 62ba337..b4154da 100644 (file)
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -38,51 +38,80 @@ static struct
        struct ip6t_replace repl;
        struct ip6t_standard entries[2];
        struct ip6t_error term;
-} initial_table __initdata 
-= { { "raw", RAW_VALID_HOOKS, 3,
-      sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
-      { [NF_IP6_PRE_ROUTING]   0,
-       [NF_IP6_LOCAL_OUT]      sizeof(struct ip6t_standard) },
-      { [NF_IP6_PRE_ROUTING]   0,
-       [NF_IP6_LOCAL_OUT]      sizeof(struct ip6t_standard) },
-      0, NULL, { } },
-    {
-           /* PRE_ROUTING */
-            { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-           /* LOCAL_OUT */
-            { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-               0,
-               sizeof(struct ip6t_entry),
-               sizeof(struct ip6t_standard),
-               0, { 0, 0 }, { } },
-             { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-               -NF_ACCEPT - 1 } },
-    },
-    /* ERROR */
-    { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-       0,
-       sizeof(struct ip6t_entry),
-       sizeof(struct ip6t_error),
-       0, { 0, 0 }, { } },
-      { { { { IP6T_ALIGN(sizeof(struct ip6t_error_target)), IP6T_ERROR_TARGET } },
-         { } },
-       "ERROR"
-      }
-    }
+} initial_table __initdata = {
+       .repl = {
+               .name = "raw",
+               .valid_hooks = RAW_VALID_HOOKS,
+               .num_entries = 3,
+               .size = sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
+               .hook_entry = {
+                       [NF_IP6_PRE_ROUTING] = 0,
+                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard)
+               },
+               .underflow = {
+                       [NF_IP6_PRE_ROUTING] = 0,
+                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard)
+               },
+       },
+       .entries = {
+               /* PRE_ROUTING */
+               {
+                       .entry = {
+                               .target_offset = sizeof(struct ip6t_entry),
+                               .next_offset = sizeof(struct ip6t_standard),
+                       },
+                       .target = {
+                               .target = {
+                                       .u = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_standard_target)),
+                                       },
+                               },
+                               .verdict = -NF_ACCEPT - 1,
+                       },
+               },
+
+               /* LOCAL_OUT */
+               {
+                       .entry = {
+                               .target_offset = sizeof(struct ip6t_entry),
+                               .next_offset = sizeof(struct ip6t_standard),
+                       },
+                       .target = {
+                               .target = {
+                                       .u = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_standard_target)),
+                                       },
+                               },
+                               .verdict = -NF_ACCEPT - 1,
+                       },
+               },
+       },
+       /* ERROR */
+       .term = {
+               .entry = {
+                       .target_offset = sizeof(struct ip6t_entry),
+                       .next_offset = sizeof(struct ip6t_error),
+               },
+               .target = {
+                       .target = {
+                               .u = {
+                                       .user = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_error_target)),
+                                               .name = IP6T_ERROR_TARGET,
+                                       },
+                               },
+                       },
+                       .errorname = "ERROR",
+               },
+       }
 };
 
-static struct ip6t_table packet_raw = { 
+static struct xt_table packet_raw = { 
        .name = "raw", 
-       .table = &initial_table.repl,
        .valid_hooks = RAW_VALID_HOOKS, 
        .lock = RW_LOCK_UNLOCKED, 
-       .me = THIS_MODULE
+       .me = THIS_MODULE,
+       .af = AF_INET6,
 };
 
 /* The work comes in here from netfilter.c. */
@@ -93,7 +122,7 @@ ip6t_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_raw, NULL);
+       return ip6t_do_table(pskb, hook, in, out, &packet_raw);
 }
 
 static struct nf_hook_ops ip6t_ops[] = { 
@@ -101,54 +130,45 @@ static struct nf_hook_ops ip6t_ops[] = {
          .hook = ip6t_hook, 
          .pf = PF_INET6,
          .hooknum = NF_IP6_PRE_ROUTING,
-         .priority = NF_IP6_PRI_FIRST
+         .priority = NF_IP6_PRI_FIRST,
+         .owner = THIS_MODULE,
        },
        {
          .hook = ip6t_hook, 
          .pf = PF_INET6, 
          .hooknum = NF_IP6_LOCAL_OUT,
-         .priority = NF_IP6_PRI_FIRST
+         .priority = NF_IP6_PRI_FIRST,
+         .owner = THIS_MODULE,
        },
 };
 
-static int __init init(void)
+static int __init ip6table_raw_init(void)
 {
        int ret;
 
        /* Register table */
-       ret = ip6t_register_table(&packet_raw);
+       ret = ip6t_register_table(&packet_raw, &initial_table.repl);
        if (ret < 0)
                return ret;
 
        /* Register hooks */
-       ret = nf_register_hook(&ip6t_ops[0]);
+       ret = nf_register_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
        if (ret < 0)
                goto cleanup_table;
 
-       ret = nf_register_hook(&ip6t_ops[1]);
-       if (ret < 0)
-               goto cleanup_hook0;
-
        return ret;
 
- cleanup_hook0:
-       nf_unregister_hook(&ip6t_ops[0]);
  cleanup_table:
        ip6t_unregister_table(&packet_raw);
-
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit ip6table_raw_fini(void)
 {
-       unsigned int i;
-
-       for (i = 0; i < sizeof(ip6t_ops)/sizeof(struct nf_hook_ops); i++)
-               nf_unregister_hook(&ip6t_ops[i]);
-
+       nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
        ip6t_unregister_table(&packet_raw);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ip6table_raw_init);
+module_exit(ip6table_raw_fini);
 MODULE_LICENSE("GPL");