Skip to content

Commit

Permalink
Fixed variable casing for ecn and qdisc option strings
Browse files Browse the repository at this point in the history 
Shell variables are supposed to be all upper-case, so fixed the badly camel-cased
eECN and iECN (EECN, IECN) as well as eqdisc_opts and iqdisc_opts
(EQDISC_OPTS, IQDISC_OPTS); retained the underscores to keep the last to readable.
All changes tested under 3.10.28-1.
  • Loading branch information
Your Name committed Feb 4, 2014
1 parent 93840e8 commit cf7577c
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
26 changes: 13 additions & 13 deletions net/sqm-scripts/files/usr/lib/sqm/functions.sh
View file
Expand Up @@ -39,10 +39,10 @@ do_modules() {
[ -z "$LIMIT" ] && LIMIT=1000
#[ -z "$AUTOECN" ] && AUTOECN=1
#[ -z "$ALLECN" ] && ALLECN=2
[ -z "$iECN" ] && iECN="ECN"
[ -z "$eECN" ] && eECN="NOECN"
[ -z "$iqdisc_opts" ] && iqdisc_opts=""
[ -z "$eqdisc_opts" ] && eqdisc_opts=""
[ -z "$IECN" ] && IECN="ECN"
[ -z "$EECN" ] && EECN="NOECN"
[ -z "$IQDISC_OPTS" ] && IQDISC_OPTS=""
[ -z "$EQDISC_OPTS" ] && EQDISC_OPTS=""
[ -z "$TC" ] && TC=`which tc`
# [ -z "$TC" ] && TC="logger tc"# this redirects all tc calls into the log
[ -z "$INSMOD" ] && INSMOD=`which insmod`
Expand Down Expand Up @@ -174,35 +174,35 @@ get_quantum() {


get_ECN() {
curECN=$1
#logger curECN: $curECN
case ${curECN} in
CURECN=$1
#logger CURECN: $CURECN
case ${CURECN} in
ECN)
case $QDISC in
*codel|*pie|*red)
curECN=ecn
CURECN=ecn
;;
*)
curECN=""
CURECN=""
;;
esac
;;
NOECN)
case $QDISC in
*codel|*pie|*red)
curECN=noecn
CURECN=noecn
;;
*)
curECN=""
CURECN=""
;;
esac
;;
*)
logger "ecn value $1 not handled"
;;
esac
#logger "get_ECN: $1 curECN: ${curECN} iECN: ${iECN} eECN: ${eECN}"
echo ${curECN}
#logger "get_ECN: $1 CURECN: ${CURECN} IECN: ${IECN} EECN: ${EECN}"
echo ${CURECN}

}

Expand Down
8 changes: 4 additions & 4 deletions net/sqm-scripts/files/usr/lib/sqm/run.sh
View file
Expand Up @@ -22,10 +22,10 @@ run_simple_qos() {
export STAB_TSIZE=$(config_get "$section" tcTSIZE)
export STAB_MPU=$(config_get "$section" tcMPU)
export LIMIT=$(config_get "$section" limit)
export iECN=$(config_get "$section" ingress_ecn)
export eECN=$(config_get "$section" egress_ecn)
export iqdisc_opts=$(config_get "$section" iqdisc_opts)
export eqdisc_opts=$(config_get "$section" eqdisc_opts)
export IECN=$(config_get "$section" ingress_ecn)
export EECN=$(config_get "$section" egress_ecn)
export IQDISC_OPTS=$(config_get "$section" iqdisc_opts)
export EQDISC_OPTS=$(config_get "$section" eqdisc_opts)
export TARGET=$(config_get "$section" target)
export SQUASH_INGRESS=$(config_get "$section" squash_ingress)
export DEV="ifb${IFB_NUM}"
Expand Down
12 changes: 6 additions & 6 deletions net/sqm-scripts/files/usr/lib/sqm/simple.qos
View file
Expand Up @@ -74,9 +74,9 @@ $TC class add dev $IFACE parent 1:1 classid 1:11 htb $LQ rate 128kbit ceil ${PRI
$TC class add dev $IFACE parent 1:1 classid 1:12 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit prio 2 `get_htb_adsll_string`
$TC class add dev $IFACE parent 1:1 classid 1:13 htb $LQ rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit prio 3 `get_htb_adsll_string`

$TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC limit $LIMIT `get_ECN ${eECN}` `get_quantum 300` `get_flows ${PRIO_RATE}` ${eqdisc_opts}
$TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC limit $LIMIT `get_ECN ${eECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${eqdisc_opts}
$TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC limit $LIMIT `get_ECN ${eECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${eqdisc_opts}
$TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC limit $LIMIT `get_ECN ${EECN}` `get_quantum 300` `get_flows ${PRIO_RATE}` ${EQDISC_OPTS}
$TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC limit $LIMIT `get_ECN ${EECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${EQDISC_OPTS}
$TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC limit $LIMIT `get_ECN ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}


# Need a catchall rule
Expand Down Expand Up @@ -134,9 +134,9 @@ $TC class add dev $DEV parent 1:1 classid 1:13 htb $LQ rate ${BK_RATE}kbit ceil

# I'd prefer to use a pre-nat filter but that causes permutation...

$TC qdisc add dev $DEV parent 1:11 handle 110: $QDISC limit $LIMIT `get_ECN ${iECN}` `get_quantum 500` `get_flows ${PRIO_RATE}` ${iqdisc_opts}
$TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC limit $LIMIT `get_ECN ${iECN}` `get_quantum 1500` `get_flows ${BE_RATE}` ${iqdisc_opts}
$TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC limit $LIMIT `get_ECN ${iECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${iqdisc_opts}
$TC qdisc add dev $DEV parent 1:11 handle 110: $QDISC limit $LIMIT `get_ECN ${IECN}` `get_quantum 500` `get_flows ${PRIO_RATE}` ${IQDISC_OPTS}
$TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC limit $LIMIT `get_ECN ${IECN}` `get_quantum 1500` `get_flows ${BE_RATE}` ${IQDISC_OPTS}
$TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC limit $LIMIT `get_ECN ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}

diffserv $DEV

Expand Down
4 changes: 2 additions & 2 deletions net/sqm-scripts/files/usr/lib/sqm/simplest.qos
View file
Expand Up @@ -20,7 +20,7 @@ $TC qdisc del dev $IFACE root 2>/dev/null
$TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 10
$TC class add dev $IFACE parent 1: classid 1:1 htb $LQ rate ${UPLINK}kbit ceil ${UPLINK}kbit `get_htb_adsll_string`
$TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ rate ${UPLINK}kbit ceil ${UPLINK}kbit prio 0 `get_htb_adsll_string`
$TC qdisc add dev $IFACE parent 1:10 handle 110: $QDISC limit $LIMIT `get_ECN ${eECN}` `get_flows ${UPLINK}` ${eqdisc_opts}
$TC qdisc add dev $IFACE parent 1:10 handle 110: $QDISC limit $LIMIT `get_ECN ${EECN}` `get_flows ${UPLINK}` ${EQDISC_OPTS}

}

Expand All @@ -42,7 +42,7 @@ $TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil

# Most high rate flows are REALLY close. This stomps on those harder, but hurts on high rate long distance
#$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC limit $LIMIT $ECN interval 20ms target 3ms `get_flows ${DOWNLINK}`
$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC limit $LIMIT `get_ECN ${iECN}` `get_flows ${DOWNLINK}` ${iqdisc_opts}
$TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC limit $LIMIT `get_ECN ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}

ifconfig $DEV up

Expand Down

0 comments on commit cf7577c

Please sign in to comment.