[NETFILTER]: x_tables: switch hotdrop to bool

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

diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c
index 9316c75..e581afe 100644 (file)
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -47,7 +47,7 @@ match_packet(const struct sk_buff *skb,
             int chunk_match_type,
             const struct xt_sctp_flag_info *flag_info,
             const int flag_count,
-            int *hotdrop)
+            bool *hotdrop)
 {
        u_int32_t chunkmapcopy[256 / sizeof (u_int32_t)];
        sctp_chunkhdr_t _sch, *sch;
@@ -64,35 +64,35 @@ match_packet(const struct sk_buff *skb,
                sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
                if (sch == NULL || sch->length == 0) {
                        duprintf("Dropping invalid SCTP packet.\n");
-                       *hotdrop = 1;
+                       *hotdrop = true;
                        return 0;
-               }
+               }
 
-               duprintf("Chunk num: %d\toffset: %d\ttype: %d\tlength: %d\tflags: %x\n", 
+               duprintf("Chunk num: %d\toffset: %d\ttype: %d\tlength: %d\tflags: %x\n",
                                ++i, offset, sch->type, htons(sch->length), sch->flags);
 
-               offset += (htons(sch->length) + 3) & ~3;
+               offset += (ntohs(sch->length) + 3) & ~3;
 
                duprintf("skb->len: %d\toffset: %d\n", skb->len, offset);
 
                if (SCTP_CHUNKMAP_IS_SET(chunkmap, sch->type)) {
                        switch (chunk_match_type) {
                        case SCTP_CHUNK_MATCH_ANY:
-                               if (match_flags(flag_info, flag_count, 
+                               if (match_flags(flag_info, flag_count,
                                        sch->type, sch->flags)) {
                                        return 1;
                                }
                                break;
 
                        case SCTP_CHUNK_MATCH_ALL:
-                               if (match_flags(flag_info, flag_count, 
+                               if (match_flags(flag_info, flag_count,
                                        sch->type, sch->flags)) {
                                        SCTP_CHUNKMAP_CLEAR(chunkmapcopy, sch->type);
                                }
                                break;
 
                        case SCTP_CHUNK_MATCH_ONLY:
-                               if (!match_flags(flag_info, flag_count, 
+                               if (!match_flags(flag_info, flag_count,
                                        sch->type, sch->flags)) {
                                        return 0;
                                }
@@ -127,7 +127,7 @@ match(const struct sk_buff *skb,
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
        const struct xt_sctp_info *info = matchinfo;
        sctp_sctphdr_t _sh, *sh;
@@ -136,24 +136,24 @@ match(const struct sk_buff *skb,
                duprintf("Dropping non-first fragment.. FIXME\n");
                return 0;
        }
-       
+
        sh = skb_header_pointer(skb, protoff, sizeof(_sh), &_sh);
        if (sh == NULL) {
                duprintf("Dropping evil TCP offset=0 tinygram.\n");
-               *hotdrop = 1;
+               *hotdrop = true;
                return 0;
-               }
+       }
        duprintf("spt: %d\tdpt: %d\n", ntohs(sh->source), ntohs(sh->dest));
 
-       return  SCCHECK(((ntohs(sh->source) >= info->spts[0]) 
-                       && (ntohs(sh->source) <= info->spts[1])), 
-                       XT_SCTP_SRC_PORTS, info->flags, info->invflags)
-               && SCCHECK(((ntohs(sh->dest) >= info->dpts[0]) 
-                       && (ntohs(sh->dest) <= info->dpts[1])), 
+       return  SCCHECK(((ntohs(sh->source) >= info->spts[0])
+                       && (ntohs(sh->source) <= info->spts[1])),
+                       XT_SCTP_SRC_PORTS, info->flags, info->invflags)
+               && SCCHECK(((ntohs(sh->dest) >= info->dpts[0])
+                       && (ntohs(sh->dest) <= info->dpts[1])),
                        XT_SCTP_DEST_PORTS, info->flags, info->invflags)
-               && SCCHECK(match_packet(skb, protoff,
+               && SCCHECK(match_packet(skb, protoff + sizeof (sctp_sctphdr_t),
                                        info->chunkmap, info->chunk_match_type,
-                                       info->flag_info, info->flag_count, 
+                                       info->flag_info, info->flag_count,
                                        hotdrop),
                           XT_SCTP_CHUNK_TYPES, info->flags, info->invflags);
 }
@@ -163,7 +163,6 @@ checkentry(const char *tablename,
           const void *inf,
           const struct xt_match *match,
           void *matchinfo,
-          unsigned int matchsize,
           unsigned int hook_mask)
 {
        const struct xt_sctp_info *info = matchinfo;
@@ -171,51 +170,42 @@ checkentry(const char *tablename,
        return !(info->flags & ~XT_SCTP_VALID_FLAGS)
                && !(info->invflags & ~XT_SCTP_VALID_FLAGS)
                && !(info->invflags & ~info->flags)
-               && ((!(info->flags & XT_SCTP_CHUNK_TYPES)) || 
+               && ((!(info->flags & XT_SCTP_CHUNK_TYPES)) ||
                        (info->chunk_match_type &
-                               (SCTP_CHUNK_MATCH_ALL 
+                               (SCTP_CHUNK_MATCH_ALL
                                | SCTP_CHUNK_MATCH_ANY
                                | SCTP_CHUNK_MATCH_ONLY)));
 }
 
-static struct xt_match sctp_match = {
-       .name           = "sctp",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_sctp_info),
-       .proto          = IPPROTO_SCTP,
-       .checkentry     = checkentry,
-       .family         = AF_INET,
-       .me             = THIS_MODULE
-};
-
-static struct xt_match sctp6_match = {
-       .name           = "sctp",
-       .match          = match,
-       .matchsize      = sizeof(struct xt_sctp_info),
-       .proto          = IPPROTO_SCTP,
-       .checkentry     = checkentry,
-       .family         = AF_INET6,
-       .me             = THIS_MODULE
+static struct xt_match xt_sctp_match[] = {
+       {
+               .name           = "sctp",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_sctp_info),
+               .proto          = IPPROTO_SCTP,
+               .me             = THIS_MODULE
+       },
+       {
+               .name           = "sctp",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_sctp_info),
+               .proto          = IPPROTO_SCTP,
+               .me             = THIS_MODULE
+       },
 };
 
 static int __init xt_sctp_init(void)
 {
-       int ret;
-       ret = xt_register_match(&sctp_match);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&sctp6_match);
-       if (ret)
-               xt_unregister_match(&sctp_match);
-
-       return ret;
+       return xt_register_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
 }
 
 static void __exit xt_sctp_fini(void)
 {
-       xt_unregister_match(&sctp6_match);
-       xt_unregister_match(&sctp_match);
+       xt_unregister_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
 }
 
 module_init(xt_sctp_init);