[NETFILTER]: xt_policy: remove dups in .family
[linux-2.6.git] / net / netfilter / xt_tcpudp.c
index 1b61dac..e76a68e 100644 (file)
@@ -141,7 +141,6 @@ tcp_checkentry(const char *tablename,
               const void *info,
               const struct xt_match *match,
               void *matchinfo,
-              unsigned int matchsize,
               unsigned int hook_mask)
 {
        const struct xt_tcp *tcpinfo = matchinfo;
@@ -190,7 +189,6 @@ udp_checkentry(const char *tablename,
               const void *info,
               const struct xt_match *match,
               void *matchinfo,
-              unsigned int matchsize,
               unsigned int hook_mask)
 {
        const struct xt_tcp *udpinfo = matchinfo;
@@ -199,81 +197,54 @@ udp_checkentry(const char *tablename,
        return !(udpinfo->invflags & ~XT_UDP_INV_MASK);
 }
 
-static struct xt_match tcp_matchstruct = {
-       .name           = "tcp",
-       .match          = tcp_match,
-       .matchsize      = sizeof(struct xt_tcp),
-       .proto          = IPPROTO_TCP,
-       .family         = AF_INET,
-       .checkentry     = tcp_checkentry,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match tcp6_matchstruct = {
-       .name           = "tcp",
-       .match          = tcp_match,
-       .matchsize      = sizeof(struct xt_tcp),
-       .proto          = IPPROTO_TCP,
-       .family         = AF_INET6,
-       .checkentry     = tcp_checkentry,
-       .me             = THIS_MODULE,
-};
-
-static struct xt_match udp_matchstruct = {
-       .name           = "udp",
-       .match          = udp_match,
-       .matchsize      = sizeof(struct xt_udp),
-       .proto          = IPPROTO_UDP,
-       .family         = AF_INET,
-       .checkentry     = udp_checkentry,
-       .me             = THIS_MODULE,
-};
-static struct xt_match udp6_matchstruct = {
-       .name           = "udp",
-       .match          = udp_match,
-       .matchsize      = sizeof(struct xt_udp),
-       .proto          = IPPROTO_UDP,
-       .family         = AF_INET6,
-       .checkentry     = udp_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 xt_tcpudp_init(void)
 {
-       int ret;
-       ret = xt_register_match(&tcp_matchstruct);
-       if (ret)
-               return ret;
-
-       ret = xt_register_match(&tcp6_matchstruct);
-       if (ret)
-               goto out_unreg_tcp;
-
-       ret = xt_register_match(&udp_matchstruct);
-       if (ret)
-               goto out_unreg_tcp6;
-       
-       ret = xt_register_match(&udp6_matchstruct);
-       if (ret)
-               goto out_unreg_udp;
-
-       return ret;
-
-out_unreg_udp:
-       xt_unregister_match(&tcp_matchstruct);
-out_unreg_tcp6:
-       xt_unregister_match(&tcp6_matchstruct);
-out_unreg_tcp:
-       xt_unregister_match(&tcp_matchstruct);
-       return ret;
+       return xt_register_matches(xt_tcpudp_match,
+                                  ARRAY_SIZE(xt_tcpudp_match));
 }
 
 static void __exit xt_tcpudp_fini(void)
 {
-       xt_unregister_match(&udp6_matchstruct);
-       xt_unregister_match(&udp_matchstruct);
-       xt_unregister_match(&tcp6_matchstruct);
-       xt_unregister_match(&tcp_matchstruct);
+       xt_unregister_matches(xt_tcpudp_match, ARRAY_SIZE(xt_tcpudp_match));
 }
 
 module_init(xt_tcpudp_init);