Commit:     9bb268ed7c5f0ec76a5bd6824450a104231152ba
Parent:     11fa2aa362fa54b9eaa8adce9a89f9b467cc9214
Author:     Jan Engelhardt <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 14 23:32:37 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:02:18 2008 -0800

    [NETFILTER]: xt_TOS: Change semantic of mask value
    This patch changes the behavior of xt_TOS v1 so that the mask value
    the user supplies means "zero out these bits" rather than "keep these
    bits". This is more easy on the user, as (I would assume) people keep
    more bits than zeroing, so, an example:
        Action:     Set bit 0x01.
                before (&): iptables -j TOS --set-tos 0x01/0xFE
                after (&~): iptables -j TOS --set-tos 0x01/0x01
    This is not too "tragic" with xt_TOS, but where larger fields are used
    (e.g. proposed xt_MARK v2), `--set-xmar 0x01/0x01` vs. `--set-xmark
    0x01/0xFFFFFFFE` really makes a difference. Other target(!) modules,
    such as xt_TPROXY also use &~ rather than &, so let's get to a common
    (Since xt_TOS has not yet left the development tree en direction to
    mainline, the semantic can be changed as proposed without breaking
    Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
    Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/netfilter/xt_DSCP.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/netfilter/xt_DSCP.c b/net/netfilter/xt_DSCP.c
index fd7500e..9951e7f 100644
--- a/net/netfilter/xt_DSCP.c
+++ b/net/netfilter/xt_DSCP.c
@@ -128,7 +128,7 @@ tos_tg(struct sk_buff *skb, const struct net_device *in,
        u_int8_t orig, nv;
        orig = ipv4_get_dsfield(iph);
-       nv   = (orig & info->tos_mask) ^ info->tos_value;
+       nv   = (orig & ~info->tos_mask) ^ info->tos_value;
        if (orig != nv) {
                if (!skb_make_writable(skb, sizeof(struct iphdr)))
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to