qos-scripts: Fix classification of ingress traffic
authorFelix Fietkau <nbd@openwrt.org>
Tue, 19 Jan 2016 23:56:34 +0000 (23:56 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 19 Jan 2016 23:56:34 +0000 (23:56 +0000)
Set the save-mark mask for the qos_${cg} chain to 0xff instead of
0xf0.  With the old value, the nibble that was saved would be
masked during the restore, preventing ingress traffic from being
classified.  Thanks to nbd for recommending the fix.

Signed-off-by: Michael Marley <michael@michaelmarley.com>
SVN-Revision: 48388

package/network/config/qos-scripts/files/usr/lib/qos/generate.sh

index 8d22b675c400680fd3b8fa6883449bbbe0be3ef8..caa1125795b5b9b572a67205987ffbeadacb7cb3 100755 (executable)
@@ -427,7 +427,7 @@ ${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg}_ct -j CONNMARK --save
 iptables -t mangle -A qos_${cg} -j CONNMARK --restore-mark --mask 0x0f
 iptables -t mangle -A qos_${cg} -m mark --mark 0/0x0f -j qos_${cg}_ct
 $pktrules
-${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg} -j CONNMARK --save-mark --mask 0xf0}
+${iptrules:+${iptrules}${N}iptables -t mangle -A qos_${cg} -j CONNMARK --save-mark --mask 0xff}
 $up$N${down:+${down}$N}
 EOF
        unset INSMOD