fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / ipv4 / netfilter / ipt_TOS.c

diff --git a/net/ipv4/netfilter/ipt_TOS.c b/net/ipv4/netfilter/ipt_TOS.c
index 3a44a56..18e74ac 100644 (file)
--- a/net/ipv4/netfilter/ipt_TOS.c
+++ b/net/ipv4/netfilter/ipt_TOS.c
@@ -25,27 +25,20 @@ target(struct sk_buff **pskb,
        const struct net_device *in,
        const struct net_device *out,
        unsigned int hooknum,
-       const void *targinfo,
-       void *userinfo)
+       const struct xt_target *target,
+       const void *targinfo)
 {
        const struct ipt_tos_target_info *tosinfo = targinfo;
+       struct iphdr *iph = (*pskb)->nh.iph;
 
-       if (((*pskb)->nh.iph->tos & IPTOS_TOS_MASK) != tosinfo->tos) {
-               u_int16_t diffs[2];
-
+       if ((iph->tos & IPTOS_TOS_MASK) != tosinfo->tos) {
+               __u8 oldtos;
                if (!skb_make_writable(pskb, sizeof(struct iphdr)))
                        return NF_DROP;
-
-               diffs[0] = htons((*pskb)->nh.iph->tos) ^ 0xFFFF;
-               (*pskb)->nh.iph->tos
-                       = ((*pskb)->nh.iph->tos & IPTOS_PREC_MASK)
-                       | tosinfo->tos;
-               diffs[1] = htons((*pskb)->nh.iph->tos);
-               (*pskb)->nh.iph->check
-                       = csum_fold(csum_partial((char *)diffs,
-                                                sizeof(diffs),
-                                                (*pskb)->nh.iph->check
-                                                ^0xFFFF));
+               iph = (*pskb)->nh.iph;
+               oldtos = iph->tos;
+               iph->tos = (iph->tos & IPTOS_PREC_MASK) | tosinfo->tos;
+               nf_csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));
        }
        return IPT_CONTINUE;
 }
@@ -53,24 +46,12 @@ target(struct sk_buff **pskb,
 static int
 checkentry(const char *tablename,
           const void *e_void,
+          const struct xt_target *target,
            void *targinfo,
-           unsigned int targinfosize,
            unsigned int hook_mask)
 {
        const u_int8_t tos = ((struct ipt_tos_target_info *)targinfo)->tos;
 
-       if (targinfosize != IPT_ALIGN(sizeof(struct ipt_tos_target_info))) {
-               printk(KERN_WARNING "TOS: targinfosize %u != %Zu\n",
-                      targinfosize,
-                      IPT_ALIGN(sizeof(struct ipt_tos_target_info)));
-               return 0;
-       }
-
-       if (strcmp(tablename, "mangle") != 0) {
-               printk(KERN_WARNING "TOS: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
-               return 0;
-       }
-
        if (tos != IPTOS_LOWDELAY
            && tos != IPTOS_THROUGHPUT
            && tos != IPTOS_RELIABILITY
@@ -79,26 +60,27 @@ checkentry(const char *tablename,
                printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);
                return 0;
        }
-
        return 1;
 }
 
 static struct ipt_target ipt_tos_reg = {
        .name           = "TOS",
        .target         = target,
+       .targetsize     = sizeof(struct ipt_tos_target_info),
+       .table          = "mangle",
        .checkentry     = checkentry,
        .me             = THIS_MODULE,
 };
 
-static int __init init(void)
+static int __init ipt_tos_init(void)
 {
        return ipt_register_target(&ipt_tos_reg);
 }
 
-static void __exit fini(void)
+static void __exit ipt_tos_fini(void)
 {
        ipt_unregister_target(&ipt_tos_reg);
 }
 
-module_init(init);
-module_exit(fini);
+module_init(ipt_tos_init);
+module_exit(ipt_tos_fini);