netfilter: x_tables: use NFPROTO_* in extensions

[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..f0b4958 100644 (file)
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -21,11 +21,12 @@
 #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,
@@ -117,10 +118,54 @@ tos_tg_check_v0(const char *tablename, const void *e_void,
        return true;
 }
 
+static unsigned int
+tos_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)
+{
+       const struct xt_tos_target_info *info = targinfo;
+       struct iphdr *iph = ip_hdr(skb);
+       u_int8_t orig, nv;
+
+       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);
+               ipv4_change_dsfield(iph, 0, nv);
+       }
+
+       return XT_CONTINUE;
+}
+
+static unsigned int
+tos_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)
+{
+       const struct xt_tos_target_info *info = targinfo;
+       struct ipv6hdr *iph = ipv6_hdr(skb);
+       u_int8_t orig, nv;
+
+       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 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 +174,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),
@@ -139,13 +184,31 @@ static struct xt_target dscp_tg_reg[] __read_mostly = {
        {
                .name           = "TOS",
                .revision       = 0,
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .table          = "mangle",
                .target         = tos_tg_v0,
                .targetsize     = sizeof(struct ipt_tos_target_info),
                .checkentry     = tos_tg_check_v0,
                .me             = THIS_MODULE,
        },
+       {
+               .name           = "TOS",
+               .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_tg6,
+               .targetsize     = sizeof(struct xt_tos_target_info),
+               .me             = THIS_MODULE,
+       },
 };
 
 static int __init dscp_tg_init(void)