[NETFILTER]: x_tables: switch hotdrop to bool

[safe/jmp/linux-2.6] / net / netfilter / xt_length.c

diff --git a/net/netfilter/xt_length.c b/net/netfilter/xt_length.c
index b9e60f0..621c9ee 100644 (file)
--- a/net/netfilter/xt_length.c
+++ b/net/netfilter/xt_length.c
@@ -28,11 +28,11 @@ match(const struct sk_buff *skb,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
        const struct xt_length_info *info = matchinfo;
-       u_int16_t pktlen = ntohs(skb->nh.iph->tot_len);
-       
+       u_int16_t pktlen = ntohs(ip_hdr(skb)->tot_len);
+
        return (pktlen >= info->min && pktlen <= info->max) ^ info->invert;
 }
 
@@ -44,46 +44,42 @@ match6(const struct sk_buff *skb,
        const void *matchinfo,
        int offset,
        unsigned int protoff,
-       int *hotdrop)
+       bool *hotdrop)
 {
        const struct xt_length_info *info = matchinfo;
-       u_int16_t pktlen = ntohs(skb->nh.ipv6h->payload_len) + sizeof(struct ipv6hdr);
-       
+       const u_int16_t pktlen = (ntohs(ipv6_hdr(skb)->payload_len) +
+                                 sizeof(struct ipv6hdr));
+
        return (pktlen >= info->min && pktlen <= info->max) ^ info->invert;
 }
 
-static struct xt_match length_match = {
-       .name           = "length",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_length_info),
-       .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 struct xt_match length6_match = {
-       .name           = "length",
-       .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);