linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / netfilter / xt_NOTRACK.c

diff --git a/net/netfilter/xt_NOTRACK.c b/net/netfilter/xt_NOTRACK.c
index 98f4b53..24d477a 100644 (file)
--- a/net/netfilter/xt_NOTRACK.c
+++ b/net/netfilter/xt_NOTRACK.c
@@ -15,7 +15,6 @@ target(struct sk_buff **pskb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
-       const struct xt_target *target,
        const void *targinfo,
        void *userinfo)
 {
@@ -34,44 +33,60 @@ target(struct sk_buff **pskb,
        return XT_CONTINUE;
 }
 
-static struct xt_target notrack_reg = {
-       .name           = "NOTRACK",
-       .target         = target,
-       .targetsize     = 0,
-       .table          = "raw",
-       .family         = AF_INET,
-       .me             = THIS_MODULE,
-};
+static int
+checkentry(const char *tablename,
+          const void *entry,
+           void *targinfo,
+           unsigned int targinfosize,
+           unsigned int hook_mask)
+{
+       if (targinfosize != 0) {
+               printk(KERN_WARNING "NOTRACK: targinfosize %u != 0\n",
+                      targinfosize);
+               return 0;
+       }
+
+       if (strcmp(tablename, "raw") != 0) {
+               printk(KERN_WARNING "NOTRACK: can only be called from \"raw\" table, not \"%s\"\n", tablename);
+               return 0;
+       }
 
-static struct xt_target notrack6_reg = {
-       .name           = "NOTRACK",
-       .target         = target,
-       .targetsize     = 0,
-       .table          = "raw",
-       .family         = AF_INET6,
-       .me             = THIS_MODULE,
+       return 1;
+}
+
+static struct xt_target notrack_reg = { 
+       .name = "NOTRACK", 
+       .target = target, 
+       .checkentry = checkentry,
+       .me = THIS_MODULE,
+};
+static struct xt_target notrack6_reg = { 
+       .name = "NOTRACK", 
+       .target = target, 
+       .checkentry = checkentry,
+       .me = THIS_MODULE,
 };
 
-static int __init xt_notrack_init(void)
+static int __init init(void)
 {
        int ret;
 
-       ret = xt_register_target(&notrack_reg);
+       ret = xt_register_target(AF_INET, &notrack_reg);
        if (ret)
                return ret;
 
-       ret = xt_register_target(&notrack6_reg);
+       ret = xt_register_target(AF_INET6, &notrack6_reg);
        if (ret)
-               xt_unregister_target(&notrack_reg);
+               xt_unregister_target(AF_INET, &notrack_reg);
 
        return ret;
 }
 
-static void __exit xt_notrack_fini(void)
+static void __exit fini(void)
 {
-       xt_unregister_target(&notrack6_reg);
-       xt_unregister_target(&notrack_reg);
+       xt_unregister_target(AF_INET6, &notrack6_reg);
+       xt_unregister_target(AF_INET, &notrack_reg);
 }
 
-module_init(xt_notrack_init);
-module_exit(xt_notrack_fini);
+module_init(init);
+module_exit(fini);