This patch updates qos-scripts to support fair traffic sharing using the

[openwrt/svn-archive/archive.git] / package / qos-scripts / files / usr / lib / qos / generate.sh

diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index aceba577d58d3f4e35f30aa7748fb4b29855128c..a697e9f4a2c1444bc0a7b317527faa13abba6cf0 100755 (executable)
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -1,12 +1,21 @@
 #!/bin/sh
 [ -e /etc/functions.sh ] && . /etc/functions.sh || . ./functions.sh
 #!/bin/sh
 [ -e /etc/functions.sh ] && . /etc/functions.sh || . ./functions.sh

-[ -x /sbin/modprobe ] && insmod="modprobe" || insmod="insmod"
+[ -x /sbin/modprobe ] && {
+       insmod="modprobe"
+       rmmod="$insmod -r"
+} || {
+       insmod="insmod"
+       rmmod="rmmod"
+}

 
 add_insmod() {
        eval "export isset=\${insmod_$1}"
        case "$isset" in
                1) ;;
 
 add_insmod() {
        eval "export isset=\${insmod_$1}"
        case "$isset" in
                1) ;;

-               *) append INSMOD "$insmod $* >&- 2>&-" "$N"; export insmod_$1=1;;
+               *) {
+                       [ "$2" ] && append INSMOD "$rmmod $1 >&- 2>&-" "$N"
+                       append INSMOD "$insmod $* >&- 2>&-" "$N"; export insmod_$1=1
+               };;

        esac
 }
 
        esac
 }
 


@@ -14,6 +23,7 @@ add_insmod() {
        # only try to parse network config on openwrt
 
        find_ifname() {(
        # only try to parse network config on openwrt
 
        find_ifname() {(

+               reset_cb

                include /lib/network
                scan_interfaces
                config_get "$1" ifname
                include /lib/network
                scan_interfaces
                config_get "$1" ifname


@@ -58,16 +68,9 @@ parse_matching_rule() {
                        *:dsthost)
                                append "$var" "-d $value"
                        ;;
                        *:dsthost)
                                append "$var" "-d $value"
                        ;;

-                       *:ipp2p)
-                               add_insmod ipt_ipp2p
-                               append "$var" "-m ipp2p"
-                               case "$value" in
-                                       all) append "$var" "--edk --dc --kazaa --gnu --bit";;
-                                       *) append "$var" "--$value";;
-                               esac
-                       ;;

                        *:layer7)
                                add_insmod ipt_layer7
                        *:layer7)
                                add_insmod ipt_layer7

+                               add_insmod xt_layer7

                                append "$var" "-m layer7 --l7proto $value${pkt:+ --l7pkt}"
                        ;;
                        *:ports|*:srcports|*:dstports)
                                append "$var" "-m layer7 --l7proto $value${pkt:+ --l7pkt}"
                        ;;
                        *:ports|*:srcports|*:dstports)


@@ -110,6 +113,35 @@ parse_matching_rule() {
                                esac
                                ports=1
                        ;;
                                esac
                                ports=1
                        ;;

+                       *:connbytes)
+                               value="$(echo "$value" | sed -e 's,-,:,g')"
+                               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
+                                       append "$var" "-o $device"
+                               elif [ "$value" = "in" ]; then
+                                       append "$var" "-i $device"
+                               fi
+                       ;;

                        1:pktsize)
                                value="$(echo "$value" | sed -e 's,-,:,g')"
                                add_insmod ipt_length
                        1:pktsize)
                                value="$(echo "$value" | sed -e 's,-,:,g')"
                                add_insmod ipt_length


@@ -132,6 +164,19 @@ parse_matching_rule() {
                                        !*) append "$var" "-m mark ! --mark $class";;
                                        *) append "$var" "-m mark --mark $class";;
                                esac
                                        !*) 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"
                esac
        done
        append "$var" "$suffix"


@@ -162,18 +207,18 @@ config_cb() {
        config_get TYPE "$CONFIG_SECTION" TYPE
        case "$TYPE" in
                interface)
        config_get TYPE "$CONFIG_SECTION" TYPE
        case "$TYPE" in
                interface)

-                       config_get enabled "$CONFIG_SECTION" enabled
-                       config_get download "$CONFIG_SECTION" download
+                       config_get_bool enabled "$CONFIG_SECTION" enabled 1
+                       [ 1 -eq "$enabled" ] || return 0

                        config_get classgroup "$CONFIG_SECTION" classgroup
                        config_get classgroup "$CONFIG_SECTION" classgroup

-                       config_set "$CONFIG_SECTION" imqdev "$C"
-                       [ -z "$enabled" -o "$(($enabled))" -eq 0 ] || {
-                               C=$(($C+1))
-                               INTERFACES="$INTERFACES $CONFIG_SECTION"
-                               config_set "$classgroup" enabled 1
-                       }
+                       config_set "$CONFIG_SECTION" ifbdev "$C"
+                       C=$(($C+1))
+                       append INTERFACES "$CONFIG_SECTION"
+                       config_set "$classgroup" enabled 1

                        config_get device "$CONFIG_SECTION" device
                        config_get device "$CONFIG_SECTION" device

-                       [ -z "$device" ] && device="$(find_ifname ${CONFIG_SECTION})"
-                       config_set "$CONFIG_SECTION" device "${device:-eth0}"
+                       [ -z "$device" ] && {
+                               device="$(find_ifname ${CONFIG_SECTION})"
+                               config_set "$CONFIG_SECTION" device "${device:-eth0}"
+                       }

                ;;
                classgroup) append CG "$CONFIG_SECTION";;
                classify|default|reclassify)
                ;;
                classgroup) append CG "$CONFIG_SECTION";;
                classify|default|reclassify)


@@ -229,31 +274,34 @@ tcrules() {
 
 start_interface() {
        local iface="$1"
 
 start_interface() {
        local iface="$1"

-       local num_imq="$2"
+       local num_ifb="$2"

        config_get device "$iface" device
        config_get device "$iface" device

-       config_get enabled "$iface" enabled
-       [ -z "$device" -o -z "$enabled" ] && exit
+       config_get_bool enabled "$iface" enabled 1
+       [ -z "$device" -o 1 -ne "$enabled" ] && {
+               return 1 
+       }

        config_get upload "$iface" upload
        config_get upload "$iface" upload

-       config_get halfduplex "$iface" halfduplex
+       config_get_bool halfduplex "$iface" halfduplex

        config_get download "$iface" download
        config_get classgroup "$iface" classgroup
        config_get download "$iface" download
        config_get classgroup "$iface" classgroup

+       config_get_bool overhead "$iface" overhead 0

        
        download="${download:-${halfduplex:+$upload}}"
        enum_classes "$classgroup"
        
        download="${download:-${halfduplex:+$upload}}"
        enum_classes "$classgroup"

-       for dir in up${halfduplex} ${download:+down}; do
+       for dir in ${halfduplex:-up} ${download:+down}; do

                case "$dir" in
                        up)
                case "$dir" in
                        up)

-                               upload=$(($upload * 98 / 100 - (32 * 128 / $upload)))
+                               [ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (15 * 128 / $upload)))

                                dev="$device"
                                rate="$upload"
                                dl_mode=""
                                prefix="cls"
                        ;;
                        down)
                                dev="$device"
                                rate="$upload"
                                dl_mode=""
                                prefix="cls"
                        ;;
                        down)

-                               add_insmod imq numdevs="$num_imq"
-                               config_get imqdev "$iface" imqdev
-                               download=$(($download * 98 / 100 - (100 * 1024 / $download)))
-                               dev="imq$imqdev"
+                               [ "$(ls -d /proc/sys/net/ipv4/conf/ifb* 2>&- | wc -l)" -ne "$num_ifb" ] && add_insmod ifb numifbs="$num_ifb"
+                               config_get ifbdev "$iface" ifbdev
+                               [ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
+                               dev="ifb$ifbdev"

                                rate="$download"
                                dl_mode=1
                                prefix="d_cls"
                                rate="$download"
                                dl_mode=1
                                prefix="d_cls"


@@ -267,8 +315,10 @@ start_interface() {
                        cls_var maxrate "$class" limitrate $dir 100
                        cls_var prio "$class" priority $dir 1
                        cls_var avgrate "$class" avgrate $dir 0
                        cls_var maxrate "$class" limitrate $dir 100
                        cls_var prio "$class" priority $dir 1
                        cls_var avgrate "$class" avgrate $dir 0

+                       cls_var qdisc "$class" qdisc $dir ""
+                       cls_var filter "$class" filter $dir ""

                        config_get classnr "$class" classnr
                        config_get classnr "$class" classnr

-                       append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate" "$N"
+                       append cstr "$classnr:$prio:$avgrate:$pktsize:$pktdelay:$maxrate:$qdisc:$filter" "$N"

                done
                append ${prefix}q "$(tcrules)" "$N"
                export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-
                done
                append ${prefix}q "$(tcrules)" "$N"
                export dev_${dir}="ifconfig $dev up txqueuelen 5 >&- 2>&-


@@ -276,6 +326,22 @@ tc qdisc del dev $dev root >&- 2>&-
 tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0
 tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"
        done
 tc qdisc add dev $dev root handle 1: hfsc default ${class_default}0
 tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${rate}kbit"
        done

+       [ -n "$download" ] && {
+               add_insmod cls_u32
+               add_insmod em_u32
+               add_insmod act_connmark
+               add_insmod act_mirred
+               add_insmod sch_ingress
+       }
+       if [ -n "$halfduplex" ]; then
+               export dev_up="tc qdisc del dev $device root >&- 2>&-
+tc qdisc add dev $device root handle 1: hfsc
+tc filter add dev $device parent 1: protocol ip prio 10 u32 match u32 0 0 flowid 1:1 action mirred egress redirect dev ifb$ifbdev"
+       elif [ -n "$download" ]; then
+               append dev_${dir} "tc qdisc del dev $device ingress >&- 2>&-
+tc qdisc add dev $device ingress
+tc filter add dev $device parent ffff: protocol ip prio 1 u32 match u32 0 0 flowid 1:1 action connmark action mirred egress redirect dev ifb$ifbdev" "$N"
+       fi

        add_insmod cls_fw
        add_insmod sch_hfsc
        add_insmod sch_sfq
        add_insmod cls_fw
        add_insmod sch_hfsc
        add_insmod sch_sfq


@@ -284,7 +350,7 @@ tc class add dev $dev parent 1: classid 1:1 hfsc sc rate ${rate}kbit ul rate ${r
        cat <<EOF
 ${INSMOD:+$INSMOD$N}${dev_up:+$dev_up
 $clsq
        cat <<EOF
 ${INSMOD:+$INSMOD$N}${dev_up:+$dev_up
 $clsq

-}${imqdev:+$dev_down
+}${ifbdev:+$dev_down

 $d_clsq
 $d_clsl
 $d_clsf
 $d_clsq
 $d_clsl
 $d_clsf


@@ -310,6 +376,16 @@ add_rules() {
                config_get target "$rule" target
                config_get target "$target" classnr
                config_get options "$rule" options
                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
                parse_matching_rule iptrule "$rule" "$options" "$prefix" "-j MARK --set-mark $target"
                append "$var" "$iptrule" "$N"
        done


@@ -320,7 +396,6 @@ start_cg() {
        local iptrules
        local pktrules
        local sizerules
        local iptrules
        local pktrules
        local sizerules

-       local download

        enum_classes "$cg"
        add_rules iptrules "$ctrules" "iptables -t mangle -A ${cg}_ct"
        config_get classes "$cg" classes
        enum_classes "$cg"
        add_rules iptrules "$ctrules" "iptables -t mangle -A ${cg}_ct"
        config_get classes "$cg" classes


@@ -336,19 +411,13 @@ start_cg() {
        for iface in $INTERFACES; do
                config_get classgroup "$iface" classgroup
                config_get device "$iface" device
        for iface in $INTERFACES; do
                config_get classgroup "$iface" classgroup
                config_get device "$iface" device

-               config_get imqdev "$iface" imqdev
-               config_get dl "$iface" download
+               config_get ifbdev "$iface" ifbdev
+               config_get upload "$iface" upload
+               config_get download "$iface" download

                config_get halfduplex "$iface" halfduplex
                config_get halfduplex "$iface" halfduplex

-               add_insmod ipt_IMQ
+               download="${download:-${halfduplex:+$upload}}"

                append up "iptables -t mangle -A OUTPUT -o $device -j ${cg}" "$N"
                append up "iptables -t mangle -A FORWARD -o $device -j ${cg}" "$N"
                append up "iptables -t mangle -A OUTPUT -o $device -j ${cg}" "$N"
                append up "iptables -t mangle -A FORWARD -o $device -j ${cg}" "$N"

-               [ -z "$dl" ] || {
-                       [ -z "$halfduplex" ] || {
-                               append down "iptables -t mangle -A POSTROUTING -o $device -j IMQ --todev $imqdev" "$N"
-                       }
-                       append down "iptables -t mangle -A PREROUTING -i $device -j ${cg}" "$N"
-                       append down "iptables -t mangle -A PREROUTING -i $device -j IMQ --todev $imqdev" "$N"
-               }

        done
        cat <<EOF
 $INSMOD
        done
        cat <<EOF
 $INSMOD