qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 22:21:51 +02:00
Code

qos-scripts: add patch for tos and dscp support from #2291

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8663 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-09-07 09:27:22 +00:00
parent 2370199538
commit c80b7f575e
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
package/qos-scripts/files/usr/lib/qos/generate.sh
View File

@ -116,6 +116,22 @@ parse_matching_rule() {
add_insmod ipt_connbytes add_insmod ipt_connbytes
append "$var" "-m connbytes --connbytes $value --connbytes-dir both --connbytes-mode bytes" 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) *:direction)
value="$(echo "$value" | sed -e 's,-,:,g')" value="$(echo "$value" | sed -e 's,-,:,g')"
if [ "$value" = "out" ]; then if [ "$value" = "out" ]; then
@ -146,6 +162,19 @@ parse_matching_rule() {
!*) append "$var" "-m mark ! --mark $class";; !*) append "$var" "-m mark ! --mark $class";;
*) append "$var" "-m mark --mark $class";; *) append "$var" "-m mark --mark $class";;
esac 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 esac
done done
append "$var" "$suffix" append "$var" "$suffix"
@ -327,6 +356,16 @@ add_rules() {
config_get target "$rule" target config_get target "$rule" target
config_get target "$target" classnr config_get target "$target" classnr
config_get options "$rule" options 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" parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target"
append "$var" "$iptrule" "$N" append "$var" "$iptrule" "$N"
done done