[NETFILTER]: xt_policy: remove dups in .family
[linux-2.6.git] / net / netfilter / xt_tcpudp.c
index 33f86fd..e76a68e 100644 (file)
@@ -1,6 +1,7 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <net/ip.h>
+#include <linux/ipv6.h>
 #include <net/ipv6.h>
 #include <net/tcp.h>
 #include <net/udp.h>
@@ -73,6 +74,7 @@ static int
 tcp_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,
@@ -137,43 +139,21 @@ tcp_match(const struct sk_buff *skb,
 static int
 tcp_checkentry(const char *tablename,
               const void *info,
+              const struct xt_match *match,
               void *matchinfo,
-              unsigned int matchsize,
               unsigned int hook_mask)
 {
-       const struct ipt_ip *ip = info;
        const struct xt_tcp *tcpinfo = matchinfo;
 
-       /* Must specify proto == TCP, and no unknown invflags */
-       return ip->proto == IPPROTO_TCP
-               && !(ip->invflags & XT_INV_PROTO)
-               && matchsize == XT_ALIGN(sizeof(struct xt_tcp))
-               && !(tcpinfo->invflags & ~XT_TCP_INV_MASK);
+       /* Must specify no unknown invflags */
+       return !(tcpinfo->invflags & ~XT_TCP_INV_MASK);
 }
 
-/* Called when user tries to insert an entry of this type. */
-static int
-tcp6_checkentry(const char *tablename,
-              const void *entry,
-              void *matchinfo,
-              unsigned int matchsize,
-              unsigned int hook_mask)
-{
-       const struct ip6t_ip6 *ipv6 = entry;
-       const struct xt_tcp *tcpinfo = matchinfo;
-
-       /* Must specify proto == TCP, and no unknown invflags */
-       return ipv6->proto == IPPROTO_TCP
-               && !(ipv6->invflags & XT_INV_PROTO)
-               && matchsize == XT_ALIGN(sizeof(struct xt_tcp))
-               && !(tcpinfo->invflags & ~XT_TCP_INV_MASK);
-}
-
-
 static int
 udp_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,
@@ -207,127 +187,65 @@ udp_match(const struct sk_buff *skb,
 static int
 udp_checkentry(const char *tablename,
               const void *info,
+              const struct xt_match *match,
               void *matchinfo,
-              unsigned int matchinfosize,
               unsigned int hook_mask)
 {
-       const struct ipt_ip *ip = info;
-       const struct xt_udp *udpinfo = matchinfo;
-
-       /* Must specify proto == UDP, and no unknown invflags */
-       if (ip->proto != IPPROTO_UDP || (ip->invflags & XT_INV_PROTO)) {
-               duprintf("ipt_udp: Protocol %u != %u\n", ip->proto,
-                        IPPROTO_UDP);
-               return 0;
-       }
-       if (matchinfosize != XT_ALIGN(sizeof(struct xt_udp))) {
-               duprintf("ipt_udp: matchsize %u != %u\n",
-                        matchinfosize, XT_ALIGN(sizeof(struct xt_udp)));
-               return 0;
-       }
-       if (udpinfo->invflags & ~XT_UDP_INV_MASK) {
-               duprintf("ipt_udp: unknown flags %X\n",
-                        udpinfo->invflags);
-               return 0;
-       }
+       const struct xt_tcp *udpinfo = matchinfo;
 
-       return 1;
+       /* Must specify no unknown invflags */
+       return !(udpinfo->invflags & ~XT_UDP_INV_MASK);
 }
 
-/* Called when user tries to insert an entry of this type. */
-static int
-udp6_checkentry(const char *tablename,
-              const void *entry,
-              void *matchinfo,
-              unsigned int matchinfosize,
-              unsigned int hook_mask)
-{
-       const struct ip6t_ip6 *ipv6 = entry;
-       const struct xt_udp *udpinfo = matchinfo;
-
-       /* Must specify proto == UDP, and no unknown invflags */
-       if (ipv6->proto != IPPROTO_UDP || (ipv6->invflags & XT_INV_PROTO)) {
-               duprintf("ip6t_udp: Protocol %u != %u\n", ipv6->proto,
-                        IPPROTO_UDP);
-               return 0;
-       }
-       if (matchinfosize != XT_ALIGN(sizeof(struct xt_udp))) {
-               duprintf("ip6t_udp: matchsize %u != %u\n",
-                        matchinfosize, XT_ALIGN(sizeof(struct xt_udp)));
-               return 0;
-       }
-       if (udpinfo->invflags & ~XT_UDP_INV_MASK) {
-               duprintf("ip6t_udp: unknown flags %X\n",
-                        udpinfo->invflags);
-               return 0;
-       }
-
-       return 1;
-}
-
-static struct xt_match tcp_matchstruct = {
-       .name           = "tcp",
-       .match          = &tcp_match,
-       .checkentry     = &tcp_checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match tcp6_matchstruct = {
-       .name           = "tcp",
-       .match          = &tcp_match,
-       .checkentry     = &tcp6_checkentry,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match udp_matchstruct = {
-       .name           = "udp",
-       .match          = &udp_match,
-       .checkentry     = &udp_checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match udp6_matchstruct = {
-       .name           = "udp",
-       .match          = &udp_match,
-       .checkentry     = &udp6_checkentry,
-       .me             = THIS_MODULE,
+static struct xt_match xt_tcpudp_match[] = {
+       {
+               .name           = "tcp",
+               .family         = AF_INET,
+               .checkentry     = tcp_checkentry,
+               .match          = tcp_match,
+               .matchsize      = sizeof(struct xt_tcp),
+               .proto          = IPPROTO_TCP,
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "tcp",
+               .family         = AF_INET6,
+               .checkentry     = tcp_checkentry,
+               .match          = tcp_match,
+               .matchsize      = sizeof(struct xt_tcp),
+               .proto          = IPPROTO_TCP,
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "udp",
+               .family         = AF_INET,
+               .checkentry     = udp_checkentry,
+               .match          = udp_match,
+               .matchsize      = sizeof(struct xt_udp),
+               .proto          = IPPROTO_UDP,
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "udp",
+               .family         = AF_INET6,
+               .checkentry     = udp_checkentry,
+               .match          = udp_match,
+               .matchsize      = sizeof(struct xt_udp),
+               .proto          = IPPROTO_UDP,
+               .me             = THIS_MODULE,
+       },
 };
 
-static int __init init(void)
+static int __init xt_tcpudp_init(void)
 {
-       int ret;
-       ret = xt_register_match(AF_INET, &tcp_matchstruct);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(AF_INET6, &tcp6_matchstruct);
-       if (ret)
-               goto out_unreg_tcp;
-
-       ret = xt_register_match(AF_INET, &udp_matchstruct);
-       if (ret)
-               goto out_unreg_tcp6;
-       
-       ret = xt_register_match(AF_INET6, &udp6_matchstruct);
-       if (ret)
-               goto out_unreg_udp;
-
-       return ret;
-
-out_unreg_udp:
-       xt_unregister_match(AF_INET, &tcp_matchstruct);
-out_unreg_tcp6:
-       xt_unregister_match(AF_INET6, &tcp6_matchstruct);
-out_unreg_tcp:
-       xt_unregister_match(AF_INET, &tcp_matchstruct);
-       return ret;
+       return xt_register_matches(xt_tcpudp_match,
+                                  ARRAY_SIZE(xt_tcpudp_match));
 }
 
-static void __exit fini(void)
+static void __exit xt_tcpudp_fini(void)
 {
-       xt_unregister_match(AF_INET6, &udp6_matchstruct);
-       xt_unregister_match(AF_INET, &udp_matchstruct);
-       xt_unregister_match(AF_INET6, &tcp6_matchstruct);
-       xt_unregister_match(AF_INET, &tcp_matchstruct);
+       xt_unregister_matches(xt_tcpudp_match, ARRAY_SIZE(xt_tcpudp_match));
 }
 
-module_init(init);
-module_exit(fini);
+module_init(xt_tcpudp_init);
+module_exit(xt_tcpudp_fini);