aboutsummaryrefslogtreecommitdiffstats
path: root/package/qos-scripts
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-09-07 09:27:22 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-09-07 09:27:22 +0000
commit77fb42c9cb51447edbb4b682b406ed809e076064 (patch)
tree052cc29334a7f3ab2af998759b73c1b8e846ed8c /package/qos-scripts
parentb7c5e91e6f4e2908990f047e2ddc8780a6786844 (diff)
downloadupstream-77fb42c9cb51447edbb4b682b406ed809e076064.tar.gz
upstream-77fb42c9cb51447edbb4b682b406ed809e076064.tar.bz2
upstream-77fb42c9cb51447edbb4b682b406ed809e076064.zip
qos-scripts: add patch for tos and dscp support from #2291
SVN-Revision: 8663
Diffstat (limited to 'package/qos-scripts')
-rwxr-xr-xpackage/qos-scripts/files/usr/lib/qos/generate.sh39
1 files changed, 39 insertions, 0 deletions
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index a531e28981..04c833b5c5 100755
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -116,6 +116,22 @@ parse_matching_rule() {
add_insmod ipt_connbytes
append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes"
;;
+ *:tos)
+ add_insmod ipt_tos
+ case "$value" in
+ !*) append "$var" "-m tos ! --tos $value";;
+ *) append "$var" "-m tos --tos $value"
+ esac
+ ;;
+ *:dscp)
+ add_insmod ipt_dscp
+ dscp_option="--dscp"
+ [ -z "${value%%[EBCA]*}" ] && dscp_option="--dscp-class"
+ case "$value" in
+ !*) append "$var" "-m dscp ! $dscp_option $value";;
+ *) append "$var" "-m dscp $dscp_option $value"
+ esac
+ ;;
*:direction)
value="$(echo "$value" | sed -e 's,-,:,g')"
if [ "$value" = "out" ]; then
@@ -146,6 +162,19 @@ parse_matching_rule() {
!*) append "$var" "-m mark ! --mark $class";;
*) append "$var" "-m mark --mark $class";;
esac
+ ;;
+ 1:TOS)
+ add_insmod ipt_TOS
+ config_get TOS "$rule" 'TOS'
+ suffix="-j TOS --set-tos "${TOS:-"Normal-Service"}
+ ;;
+ 1:DSCP)
+ add_insmod ipt_DSCP
+ config_get DSCP "$rule" 'DSCP'
+ [ -z "${DSCP%%[EBCA]*}" ] && set_value="--set-dscp-class $DSCP" \
+ || set_value="--set-dscp $DSCP"
+ suffix="-j DSCP $set_value"
+ ;;
esac
done
append "$var" "$suffix"
@@ -327,6 +356,16 @@ add_rules() {
config_get target "$rule" target
config_get target "$target" classnr
config_get options "$rule" options
+
+ ## If we want to override the TOS field, let's clear the DSCP field first.
+ [ ! -z "$(echo $options | grep 'TOS')" ] && {
+ s_options=${options%%TOS}
+ add_insmod ipt_DSCP
+ parse_matching_rule iptrule "$rule" "$s_options" "$prefix" "-j DSCP --set-dscp 0"
+ append "$var" "$iptrule" "$N"
+ unset iptrule
+ }
+
parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target"
append "$var" "$iptrule" "$N"
done