[NETFILTER]: x_tables: return new table from {arp,ip,ip6}t_register_table()

[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 c002153..b718ec6 100644 (file)
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -11,8 +11,9 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kiran Kumar Immidi");
-MODULE_DESCRIPTION("Match for SCTP protocol packets");
+MODULE_DESCRIPTION("Xtables: SCTP protocol packet match");
 MODULE_ALIAS("ipt_sctp");
+MODULE_ALIAS("ip6t_sctp");
 
 #ifdef DEBUG_SCTP
 #define duprintf(format, args...) printk(format , ## args)
@@ -41,21 +42,21 @@ match_flags(const struct xt_sctp_flag_info *flag_info,
 static inline bool
 match_packet(const struct sk_buff *skb,
             unsigned int offset,
-            const u_int32_t *chunkmap,
-            int chunk_match_type,
-            const struct xt_sctp_flag_info *flag_info,
-            const int flag_count,
+            const struct xt_sctp_info *info,
             bool *hotdrop)
 {
        u_int32_t chunkmapcopy[256 / sizeof (u_int32_t)];
        sctp_chunkhdr_t _sch, *sch;
+       int chunk_match_type = info->chunk_match_type;
+       const struct xt_sctp_flag_info *flag_info = info->flag_info;
+       int flag_count = info->flag_count;
 
 #ifdef DEBUG_SCTP
        int i = 0;
 #endif
 
        if (chunk_match_type == SCTP_CHUNK_MATCH_ALL)
-               SCTP_CHUNKMAP_COPY(chunkmapcopy, chunkmap);
+               SCTP_CHUNKMAP_COPY(chunkmapcopy, info->chunkmap);
 
        do {
                sch = skb_header_pointer(skb, offset, sizeof(_sch), &_sch);
@@ -72,7 +73,7 @@ match_packet(const struct sk_buff *skb,
 
                duprintf("skb->len: %d\toffset: %d\n", skb->len, offset);
 
-               if (SCTP_CHUNKMAP_IS_SET(chunkmap, sch->type)) {
+               if (SCTP_CHUNKMAP_IS_SET(info->chunkmap, sch->type)) {
                        switch (chunk_match_type) {
                        case SCTP_CHUNK_MATCH_ANY:
                                if (match_flags(flag_info, flag_count,
@@ -103,7 +104,7 @@ match_packet(const struct sk_buff *skb,
 
        switch (chunk_match_type) {
        case SCTP_CHUNK_MATCH_ALL:
-               return SCTP_CHUNKMAP_IS_CLEAR(chunkmap);
+               return SCTP_CHUNKMAP_IS_CLEAR(info->chunkmap);
        case SCTP_CHUNK_MATCH_ANY:
                return false;
        case SCTP_CHUNK_MATCH_ONLY:
@@ -115,14 +116,9 @@ match_packet(const struct sk_buff *skb,
 }
 
 static bool
-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,
-      bool *hotdrop)
+sctp_mt(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, bool *hotdrop)
 {
        const struct xt_sctp_info *info = matchinfo;
        sctp_sctphdr_t _sh, *sh;
@@ -147,18 +143,14 @@ match(const struct sk_buff *skb,
                        && ntohs(sh->dest) <= info->dpts[1],
                        XT_SCTP_DEST_PORTS, info->flags, info->invflags)
                && SCCHECK(match_packet(skb, protoff + sizeof (sctp_sctphdr_t),
-                                       info->chunkmap, info->chunk_match_type,
-                                       info->flag_info, info->flag_count,
-                                       hotdrop),
+                                       info, hotdrop),
                           XT_SCTP_CHUNK_TYPES, info->flags, info->invflags);
 }
 
 static bool
-checkentry(const char *tablename,
-          const void *inf,
-          const struct xt_match *match,
-          void *matchinfo,
-          unsigned int hook_mask)
+sctp_mt_check(const char *tablename, const void *inf,
+              const struct xt_match *match, void *matchinfo,
+              unsigned int hook_mask)
 {
        const struct xt_sctp_info *info = matchinfo;
 
@@ -172,12 +164,12 @@ checkentry(const char *tablename,
                                | SCTP_CHUNK_MATCH_ONLY)));
 }
 
-static struct xt_match xt_sctp_match[] __read_mostly = {
+static struct xt_match sctp_mt_reg[] __read_mostly = {
        {
                .name           = "sctp",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = sctp_mt_check,
+               .match          = sctp_mt,
                .matchsize      = sizeof(struct xt_sctp_info),
                .proto          = IPPROTO_SCTP,
                .me             = THIS_MODULE
@@ -185,23 +177,23 @@ static struct xt_match xt_sctp_match[] __read_mostly = {
        {
                .name           = "sctp",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = sctp_mt_check,
+               .match          = sctp_mt,
                .matchsize      = sizeof(struct xt_sctp_info),
                .proto          = IPPROTO_SCTP,
                .me             = THIS_MODULE
        },
 };
 
-static int __init xt_sctp_init(void)
+static int __init sctp_mt_init(void)
 {
-       return xt_register_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
+       return xt_register_matches(sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg));
 }
 
-static void __exit xt_sctp_fini(void)
+static void __exit sctp_mt_exit(void)
 {
-       xt_unregister_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
+       xt_unregister_matches(sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg));
 }
 
-module_init(xt_sctp_init);
-module_exit(xt_sctp_fini);
+module_init(sctp_mt_init);
+module_exit(sctp_mt_exit);