fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index 39c8fae..67fd30d 100644 (file)
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -24,6 +24,7 @@ static int
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,
+      const struct xt_match *match,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
@@ -39,6 +40,7 @@ static int
 match6(const struct sk_buff *skb,
        const struct net_device *in,
        const struct net_device *out,
+       const struct xt_match *match,
        const void *matchinfo,
        int offset,
        unsigned int protoff,
@@ -50,50 +52,33 @@ match6(const struct sk_buff *skb,
        return (pktlen >= info->min && pktlen <= info->max) ^ info->invert;
 }
 
-static int
-checkentry(const char *tablename,
-           const void *ip,
-           void *matchinfo,
-           unsigned int matchsize,
-           unsigned int hook_mask)
-{
-       if (matchsize != XT_ALIGN(sizeof(struct xt_length_info)))
-               return 0;
-
-       return 1;
-}
-
-static struct xt_match length_match = {
-       .name           = "length",
-       .match          = &match,
-       .checkentry     = &checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match length6_match = {
-       .name           = "length",
-       .match          = &match6,
-       .checkentry     = &checkentry,
-       .me             = THIS_MODULE,
+static struct xt_match xt_length_match[] = {
+       {
+               .name           = "length",
+               .family         = AF_INET,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_length_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "length",
+               .family         = AF_INET6,
+               .match          = match6,
+               .matchsize      = sizeof(struct xt_length_info),
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init xt_length_init(void)
 {
-       int ret;
-       ret = xt_register_match(AF_INET, &length_match);
-       if (ret)
-               return ret;
-       ret = xt_register_match(AF_INET6, &length6_match);
-       if (ret)
-               xt_unregister_match(AF_INET, &length_match);
-
-       return ret;
+       return xt_register_matches(xt_length_match,
+                                  ARRAY_SIZE(xt_length_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_length_fini(void)
 {
-       xt_unregister_match(AF_INET, &length_match);
-       xt_unregister_match(AF_INET6, &length6_match);
+       xt_unregister_matches(xt_length_match, ARRAY_SIZE(xt_length_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_length_init);
+module_exit(xt_length_fini);