netfilter: nf_conntrack: per netns nf_conntrack_cachep

[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 40a4f1d..74ce892 100644 (file)
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -18,21 +18,19 @@
 
 #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 modification module");
+MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ipt_DSCP");
 MODULE_ALIAS("ip6t_DSCP");
 MODULE_ALIAS("ipt_TOS");
+MODULE_ALIAS("ip6t_TOS");
 
 static unsigned int
-dscp_tg(struct sk_buff *skb, const struct net_device *in,
-        const struct net_device *out, unsigned int hooknum,
-        const struct xt_target *target, const void *targinfo)
+dscp_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct xt_DSCP_info *dinfo = targinfo;
+       const struct xt_DSCP_info *dinfo = par->targinfo;
        u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT;
 
        if (dscp != dinfo->dscp) {
@@ -47,11 +45,9 @@ dscp_tg(struct sk_buff *skb, const struct net_device *in,
 }
 
 static unsigned int
-dscp_tg6(struct sk_buff *skb, const struct net_device *in,
-         const struct net_device *out, unsigned int hooknum,
-         const struct xt_target *target, const void *targinfo)
+dscp_tg6(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct xt_DSCP_info *dinfo = targinfo;
+       const struct xt_DSCP_info *dinfo = par->targinfo;
        u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT;
 
        if (dscp != dinfo->dscp) {
@@ -64,63 +60,61 @@ dscp_tg6(struct sk_buff *skb, const struct net_device *in,
        return XT_CONTINUE;
 }
 
-static bool
-dscp_tg_check(const char *tablename, const void *e_void,
-              const struct xt_target *target, void *targinfo,
-              unsigned int hook_mask)
+static bool dscp_tg_check(const struct xt_tgchk_param *par)
 {
-       const u_int8_t dscp = ((struct xt_DSCP_info *)targinfo)->dscp;
+       const struct xt_DSCP_info *info = par->targinfo;
 
-       if (dscp > XT_DSCP_MAX) {
-               printk(KERN_WARNING "DSCP: dscp %x out of range\n", dscp);
+       if (info->dscp > XT_DSCP_MAX) {
+               printk(KERN_WARNING "DSCP: dscp %x out of range\n", info->dscp);
                return false;
        }
        return true;
 }
 
 static unsigned int
-tos_tg_v0(struct sk_buff *skb, const struct net_device *in,
-          const struct net_device *out, unsigned int hooknum,
-          const struct xt_target *target, const void *targinfo)
+tos_tg(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const struct ipt_tos_target_info *info = targinfo;
+       const struct xt_tos_target_info *info = par->targinfo;
        struct iphdr *iph = ip_hdr(skb);
-       u_int8_t oldtos;
+       u_int8_t orig, nv;
 
-       if ((iph->tos & IPTOS_TOS_MASK) != info->tos) {
+       orig = ipv4_get_dsfield(iph);
+       nv   = (orig & ~info->tos_mask) ^ info->tos_value;
+
+       if (orig != nv) {
                if (!skb_make_writable(skb, sizeof(struct iphdr)))
                        return NF_DROP;
-
-               iph      = ip_hdr(skb);
-               oldtos   = iph->tos;
-               iph->tos = (iph->tos & IPTOS_PREC_MASK) | info->tos;
-               csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));
+               iph = ip_hdr(skb);
+               ipv4_change_dsfield(iph, 0, nv);
        }
 
        return XT_CONTINUE;
 }
 
-static bool
-tos_tg_check_v0(const char *tablename, const void *e_void,
-                const struct xt_target *target, void *targinfo,
-                unsigned int hook_mask)
+static unsigned int
+tos_tg6(struct sk_buff *skb, const struct xt_target_param *par)
 {
-       const u_int8_t tos = ((struct ipt_tos_target_info *)targinfo)->tos;
+       const struct xt_tos_target_info *info = par->targinfo;
+       struct ipv6hdr *iph = ipv6_hdr(skb);
+       u_int8_t orig, nv;
 
-       if (tos != IPTOS_LOWDELAY && tos != IPTOS_THROUGHPUT &&
-           tos != IPTOS_RELIABILITY && tos != IPTOS_MINCOST &&
-           tos != IPTOS_NORMALSVC) {
-               printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);
-               return false;
+       orig = ipv6_get_dsfield(iph);
+       nv   = (orig & info->tos_mask) ^ info->tos_value;
+
+       if (orig != nv) {
+               if (!skb_make_writable(skb, sizeof(struct iphdr)))
+                       return NF_DROP;
+               iph = ipv6_hdr(skb);
+               ipv6_change_dsfield(iph, 0, nv);
        }
 
-       return true;
+       return XT_CONTINUE;
 }
 
 static struct xt_target dscp_tg_reg[] __read_mostly = {
        {
                .name           = "DSCP",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .checkentry     = dscp_tg_check,
                .target         = dscp_tg,
                .targetsize     = sizeof(struct xt_DSCP_info),
@@ -129,7 +123,7 @@ static struct xt_target dscp_tg_reg[] __read_mostly = {
        },
        {
                .name           = "DSCP",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .checkentry     = dscp_tg_check,
                .target         = dscp_tg6,
                .targetsize     = sizeof(struct xt_DSCP_info),
@@ -138,12 +132,20 @@ static struct xt_target dscp_tg_reg[] __read_mostly = {
        },
        {
                .name           = "TOS",
-               .revision       = 0,
-               .family         = AF_INET,
+               .revision       = 1,
+               .family         = NFPROTO_IPV4,
+               .table          = "mangle",
+               .target         = tos_tg,
+               .targetsize     = sizeof(struct xt_tos_target_info),
+               .me             = THIS_MODULE,
+       },
+       {
+               .name           = "TOS",
+               .revision       = 1,
+               .family         = NFPROTO_IPV6,
                .table          = "mangle",
-               .target         = tos_tg_v0,
-               .targetsize     = sizeof(struct ipt_tos_target_info),
-               .checkentry     = tos_tg_check_v0,
+               .target         = tos_tg6,
+               .targetsize     = sizeof(struct xt_tos_target_info),
                .me             = THIS_MODULE,
        },
 };