Add _INGRESS suffix to DSCP variables (#55)

platform/linux/eth0.iface.conf.example

@@ -33,6 +33,6 @@ SCRIPT=simple.qos
 # CoDel target
 #TARGET=5ms
 
-#ZERO_DSCP=1
-#IGNORE_DSCP=1
+#ZERO_DSCP_INGRESS=1
+#IGNORE_DSCP_INGRESS=1
 

src/defaults.sh

@@ -19,8 +19,8 @@
 [ -z "$IECN" ] && IECN="ECN"
 [ -z "$EECN" ] && EECN="ECN"
 # These two used to be called something else; preserve backwards compatibility
-[ -z "$ZERO_DSCP" ] && ZERO_DSCP="${SQUASH_DSCP:-1}"
-[ -z "$IGNORE_DSCP" ] && IGNORE_DSCP="${SQUASH_INGRESS:-1}"
+[ -z "$ZERO_DSCP_INGRESS" ] && ZERO_DSCP_INGRESS="${ZERO_DSCP:-${SQUASH_DSCP:-1}}"
+[ -z "$IGNORE_DSCP_INGRESS" ] && IGNORE_DSCP_INGRESS="${IGNORE_DSCP:-${SQUASH_INGRESS:-1}}"
 
 [ -z "$IQDISC_OPTS" ] && IQDISC_OPTS=""
 [ -z "$EQDISC_OPTS" ] && EQDISC_OPTS=""
@@ -61,7 +61,7 @@ fi
 
 
 # This is used for writing the state file
-ALL_SQM_VARS="IFACE UPLINK DOWNLINK SCRIPT ENABLED QDISC LLAM LINKLAYER OVERHEAD STAB_MTU STAB_MPU STAB_TSIZE AUTOFLOW ILIMIT ELIMIT TARGET ITARGET ETARGET IECN EECN ZERO_DSCP IGNORE_DSCP IQDISC_OPTS EQDISC_OPTS INGRESS_CAKE_OPTS EGRESS_CAKE_OPTS SQM_DEBUG SQM_DEBUG_LOG OUTPUT_TARGET"
+ALL_SQM_VARS="IFACE UPLINK DOWNLINK SCRIPT ENABLED QDISC LLAM LINKLAYER OVERHEAD STAB_MTU STAB_MPU STAB_TSIZE AUTOFLOW ILIMIT ELIMIT TARGET ITARGET ETARGET IECN EECN ZERO_DSCP_INGRESS IGNORE_DSCP_INGRESS IQDISC_OPTS EQDISC_OPTS INGRESS_CAKE_OPTS EGRESS_CAKE_OPTS SQM_DEBUG SQM_DEBUG_LOG OUTPUT_TARGET"
 
 # These are the modules that do_modules() will attempt to load
 ALL_MODULES="act_ipt sch_$QDISC sch_ingress act_mirred cls_fw cls_flow cls_u32 sch_htb sch_hfsc"

src/layer_cake.qos

@@ -33,8 +33,8 @@ ingress() {
 
     $TC qdisc del dev $DEV root  2> /dev/null
 
-    [ "$IGNORE_DSCP" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS besteffort"
-    [ "$ZERO_DSCP" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"
+    [ "$IGNORE_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS besteffort"
+    [ "$ZERO_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"
 
     $TC qdisc add dev $DEV root $( get_stab_string ) cake \
         bandwidth ${DOWNLINK}kbit $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}

src/piece_of_cake.qos

@@ -34,7 +34,7 @@ ingress() {
     $TC qdisc add dev $IFACE handle ffff: ingress
     $TC qdisc del dev $DEV root 2>/dev/null
 
-    [ "$ZERO_DSCP" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"
+    [ "$ZERO_DSCP_INGRESS" -eq "1" ] && INGRESS_CAKE_OPTS="$INGRESS_CAKE_OPTS wash"
 
     $TC qdisc add dev $DEV root $( get_stab_string ) cake \
         bandwidth ${DOWNLINK}kbit $( get_cake_lla_string ) ${INGRESS_CAKE_OPTS} ${IQDISC_OPTS}

src/run-openwrt.sh

@@ -62,8 +62,8 @@ run_sqm_scripts() {
     # The UCI names for these two variables are confusing and should have been
     # changed ages ago. For now, keep the bad UCI names but use meaningful
     # variable names in the scripts to not break user configs.
-    export ZERO_DSCP=$(config_get "$section" squash_dscp)
-    export IGNORE_DSCP=$(config_get "$section" squash_ingress)
+    export ZERO_DSCP_INGRESS=$(config_get "$section" squash_dscp)
+    export IGNORE_DSCP_INGRESS=$(config_get "$section" squash_ingress)
 
     #sm: if SQM_DEBUG or SQM_VERBOSITY_* were passed in via the command line make them available to the other scripts
     #	this allows to override sqm's log level as set in the GUI for quick debugging without GUI accesss.

src/simple.qos

@@ -64,7 +64,7 @@ ipt_setup() {
     # incoming ToS bits whether we squash or not)
     #
     # ZERO is still useful to protect internal machines...
-    if [ "$ZERO_DSCP" = "1" ]; then
+    if [ "$ZERO_DSCP_INGRESS" = "1" ]; then
         sqm_debug "Squashing differentiated services code points (DSCP) from ingress."
         ipt -t mangle -I PREROUTING -i $IFACE -m dscp ! --dscp 0 -j DSCP --set-dscp-class be
     else
@@ -162,7 +162,7 @@ egress() {
 cake_ingress()
 {
     CAKEARGS=
-    [ "$IGNORE_DSCP" = "1" ] && CAKEARGS="$CAKEARGS besteffort"
+    [ "$IGNORE_DSCP_INGRESS" = "1" ] && CAKEARGS="$CAKEARGS besteffort"
     $TC qdisc add dev $DEV root `get_stab_string` $QDISC bandwidth ${DOWNLINK}kbit \
         $CAKEARGS `get_cake_lla_string` ${IQDISC_OPTS}
 
@@ -194,7 +194,7 @@ ingress() {
         cake*) cake_ingress; return ;;
     esac
 
-    if [ "$IGNORE_DSCP" = "1" ]; then
+    if [ "$IGNORE_DSCP_INGRESS" = "1" ]; then
         sqm_debug "Do not perform DSCP based filtering on ingress. (1-tier classification)"
         $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 10
         $TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit $BURST `get_htb_adsll_string`