netfilter: xtables: consolidate code into xt_request_find_match

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

diff --git a/net/netfilter/xt_dscp.c b/net/netfilter/xt_dscp.c
index 834e437..6ecedc1 100644 (file)
--- a/net/netfilter/xt_dscp.c
+++ b/net/netfilter/xt_dscp.c
@@ -6,7 +6,7 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/ip.h>
@@ -15,10 +15,9 @@
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_dscp.h>
-#include <linux/netfilter_ipv4/ipt_tos.h>
 
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
-MODULE_DESCRIPTION("x_tables DSCP/tos matching module");
+MODULE_DESCRIPTION("Xtables: DSCP/TOS field match");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_dscp");
 MODULE_ALIAS("ip6t_dscp");
@@ -26,61 +25,40 @@ MODULE_ALIAS("ipt_tos");
 MODULE_ALIAS("ip6t_tos");
 
 static bool
-dscp_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)
+dscp_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_dscp_info *info = matchinfo;
+       const struct xt_dscp_info *info = par->matchinfo;
        u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;
 
        return (dscp == info->dscp) ^ !!info->invert;
 }
 
 static bool
-dscp_mt6(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)
+dscp_mt6(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_dscp_info *info = matchinfo;
+       const struct xt_dscp_info *info = par->matchinfo;
        u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;
 
        return (dscp == info->dscp) ^ !!info->invert;
 }
 
-static bool
-dscp_mt_check(const char *tablename, const void *info,
-              const struct xt_match *match, void *matchinfo,
-              unsigned int hook_mask)
+static bool dscp_mt_check(const struct xt_mtchk_param *par)
 {
-       const u_int8_t dscp = ((struct xt_dscp_info *)matchinfo)->dscp;
+       const struct xt_dscp_info *info = par->matchinfo;
 
-       if (dscp > XT_DSCP_MAX) {
-               printk(KERN_ERR "xt_dscp: dscp %x out of range\n", dscp);
+       if (info->dscp > XT_DSCP_MAX) {
+               pr_info("dscp %x out of range\n", info->dscp);
                return false;
        }
 
        return true;
 }
 
-static bool tos_mt_v0(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 ipt_tos_info *info = matchinfo;
-
-       return (ip_hdr(skb)->tos == info->tos) ^ info->invert;
-}
-
-static bool tos_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)
+static bool tos_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_tos_match_info *info = matchinfo;
+       const struct xt_tos_match_info *info = par->matchinfo;
 
-       if (match->family == AF_INET)
+       if (par->family == NFPROTO_IPV4)
                return ((ip_hdr(skb)->tos & info->tos_mask) ==
                       info->tos_value) ^ !!info->invert;
        else
@@ -91,7 +69,7 @@ static bool tos_mt(const struct sk_buff *skb, const struct net_device *in,
 static struct xt_match dscp_mt_reg[] __read_mostly = {
        {
                .name           = "dscp",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .checkentry     = dscp_mt_check,
                .match          = dscp_mt,
                .matchsize      = sizeof(struct xt_dscp_info),
@@ -99,7 +77,7 @@ static struct xt_match dscp_mt_reg[] __read_mostly = {
        },
        {
                .name           = "dscp",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .checkentry     = dscp_mt_check,
                .match          = dscp_mt6,
                .matchsize      = sizeof(struct xt_dscp_info),
@@ -107,16 +85,8 @@ static struct xt_match dscp_mt_reg[] __read_mostly = {
        },
        {
                .name           = "tos",
-               .revision       = 0,
-               .family         = AF_INET,
-               .match          = tos_mt_v0,
-               .matchsize      = sizeof(struct ipt_tos_info),
-               .me             = THIS_MODULE,
-       },
-       {
-               .name           = "tos",
                .revision       = 1,
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .match          = tos_mt,
                .matchsize      = sizeof(struct xt_tos_match_info),
                .me             = THIS_MODULE,
@@ -124,7 +94,7 @@ static struct xt_match dscp_mt_reg[] __read_mostly = {
        {
                .name           = "tos",
                .revision       = 1,
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .match          = tos_mt,
                .matchsize      = sizeof(struct xt_tos_match_info),
                .me             = THIS_MODULE,