fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/net/netfilter/xt_dccp.c b/net/netfilter/xt_dccp.c
index 779f42f..3e6cf43 100644 (file)
--- a/net/netfilter/xt_dccp.c
+++ b/net/netfilter/xt_dccp.c
@@ -95,13 +95,13 @@ 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,
       int *hotdrop)
 {
-       const struct xt_dccp_info *info = 
-                               (const struct xt_dccp_info *)matchinfo;
+       const struct xt_dccp_info *info = matchinfo;
        struct dccp_hdr _dh, *dh;
 
        if (offset)
@@ -129,61 +129,39 @@ match(const struct sk_buff *skb,
 static int
 checkentry(const char *tablename,
           const void *inf,
+          const struct xt_match *match,
           void *matchinfo,
-          unsigned int matchsize,
           unsigned int hook_mask)
 {
-       const struct ipt_ip *ip = inf;
-       const struct xt_dccp_info *info;
+       const struct xt_dccp_info *info = matchinfo;
 
-       info = (const struct xt_dccp_info *)matchinfo;
-
-       return ip->proto == IPPROTO_DCCP
-               && !(ip->invflags & XT_INV_PROTO)
-               && matchsize == XT_ALIGN(sizeof(struct xt_dccp_info))
-               && !(info->flags & ~XT_DCCP_VALID_FLAGS)
-               && !(info->invflags & ~XT_DCCP_VALID_FLAGS)
-               && !(info->invflags & ~info->flags);
-}
-
-static int
-checkentry6(const char *tablename,
-          const void *inf,
-          void *matchinfo,
-          unsigned int matchsize,
-          unsigned int hook_mask)
-{
-       const struct ip6t_ip6 *ip = inf;
-       const struct xt_dccp_info *info;
-
-       info = (const struct xt_dccp_info *)matchinfo;
-
-       return ip->proto == IPPROTO_DCCP
-               && !(ip->invflags & XT_INV_PROTO)
-               && matchsize == XT_ALIGN(sizeof(struct xt_dccp_info))
-               && !(info->flags & ~XT_DCCP_VALID_FLAGS)
+       return !(info->flags & ~XT_DCCP_VALID_FLAGS)
                && !(info->invflags & ~XT_DCCP_VALID_FLAGS)
                && !(info->invflags & ~info->flags);
 }
 
-
-static struct xt_match dccp_match = 
-{ 
-       .name           = "dccp",
-       .match          = &match,
-       .checkentry     = &checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match dccp6_match = 
-{ 
-       .name           = "dccp",
-       .match          = &match,
-       .checkentry     = &checkentry6,
-       .me             = THIS_MODULE,
+static struct xt_match xt_dccp_match[] = {
+       {
+               .name           = "dccp",
+               .family         = AF_INET,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_dccp_info),
+               .proto          = IPPROTO_DCCP,
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "dccp",
+               .family         = AF_INET6,
+               .checkentry     = checkentry,
+               .match          = match,
+               .matchsize      = sizeof(struct xt_dccp_info),
+               .proto          = IPPROTO_DCCP,
+               .me             = THIS_MODULE,
+       },
 };
 
-
-static int __init init(void)
+static int __init xt_dccp_init(void)
 {
        int ret;
 
@@ -193,29 +171,21 @@ static int __init init(void)
        dccp_optbuf = kmalloc(256 * 4, GFP_KERNEL);
        if (!dccp_optbuf)
                return -ENOMEM;
-       ret = xt_register_match(AF_INET, &dccp_match);
+       ret = xt_register_matches(xt_dccp_match, ARRAY_SIZE(xt_dccp_match));
        if (ret)
                goto out_kfree;
-       ret = xt_register_match(AF_INET6, &dccp6_match);
-       if (ret)
-               goto out_unreg;
-
        return ret;
 
-out_unreg:
-       xt_unregister_match(AF_INET, &dccp_match);
 out_kfree:
        kfree(dccp_optbuf);
-
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit xt_dccp_fini(void)
 {
-       xt_unregister_match(AF_INET6, &dccp6_match);
-       xt_unregister_match(AF_INET, &dccp_match);
+       xt_unregister_matches(xt_dccp_match, ARRAY_SIZE(xt_dccp_match));
        kfree(dccp_optbuf);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_dccp_init);
+module_exit(xt_dccp_fini);