-
-
<%:A Speed Test using OpenSpeedTest that runs in the browser%>
+
+
A Speed Test using OpenSpeedTest that runs in the browser
diff --git a/rooter/0optionalapps/ext-texting/files/usr/lib/lua/luci/controller/texting.lua b/rooter/0optionalapps/ext-texting/files/usr/lib/lua/luci/controller/texting.lua
index a729365..c0c5585 100644
--- a/rooter/0optionalapps/ext-texting/files/usr/lib/lua/luci/controller/texting.lua
+++ b/rooter/0optionalapps/ext-texting/files/usr/lib/lua/luci/controller/texting.lua
@@ -1,16 +1,8 @@
module("luci.controller.texting", package.seeall)
function index()
local lock = luci.model.uci.cursor():get("custom", "menu", "full")
- local multilock = luci.model.uci.cursor():get("custom", "multiuser", "multi") or "0"
- local rootlock = luci.model.uci.cursor():get("custom", "multiuser", "root") or "0"
- if (multilock == "0") or (multilock == "1" and rootlock == "1") then
- if lock == "1" then
- if (multilock == "1" and rootlock == "1") then
- entry({"admin", "adminmenu", "texting"}, cbi("fullmenu/texting"), "Random Texting", 9)
- else
- entry({"admin", "adminmenu", "texting"}, cbi("fullmenu/texting"), "---Random Texting", 9)
- end
- end
+ if lock == "1" then
+ entry({"admin", "adminmenu", "texting"}, cbi("fullmenu/texting"), "---Random Texting", 8)
end
entry({"admin", "services", "chksms"}, call("action_chksms"))
diff --git a/rooter/0optionalapps/ext-throttle/Makefile b/rooter/0optionalapps/ext-throttle/Makefile
deleted file mode 100644
index cf731cc..0000000
--- a/rooter/0optionalapps/ext-throttle/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#Owned by DairyMan@Whirlpool
-#
-#Copyright GNU act.
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ext-throttle
-PKG_VERSION:=1.000
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Created by DM/makefile by Cobia@whirlpool
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ext-throttle
- SECTION:=utils
- CATEGORY:=ROOter
- SUBMENU:=Optional Applications
- DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \
- +iptables-mod-ipopt +iptables-mod-conntrack-extra \
- +kmod-sched-cake
- TITLE:=support for Throttle
- PKGARCH:=all
-endef
-
-define Package/ext-throttle/description
- Helper scripts to enable Throttle
-endef
-
-
-define Build/Compile
-endef
-
-define Package/ext-throttle/install
- $(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ext-throttle))
diff --git a/rooter/0optionalapps/ext-throttle/files/etc/config/sqm b/rooter/0optionalapps/ext-throttle/files/etc/config/sqm
deleted file mode 100644
index 67f58de..0000000
--- a/rooter/0optionalapps/ext-throttle/files/etc/config/sqm
+++ /dev/null
@@ -1,34 +0,0 @@
-
-config queue 'wan'
- option enabled '0'
- option download '85000'
- option upload '10000'
- option qdisc 'cake'
- option script 'piece_of_cake.qos'
- option linklayer 'none'
- option interface '0'
- option debug_logging '0'
- option verbosity '5'
-
-config queue 'wan1'
- option enabled '0'
- option download '85000'
- option upload '10000'
- option qdisc 'cake'
- option script 'piece_of_cake.qos'
- option linklayer 'none'
- option debug_logging '0'
- option verbosity '5'
- option interface '0'
-
-config queue 'wan2'
- option enabled '0'
- option download '85000'
- option upload '10000'
- option qdisc 'cake'
- option script 'piece_of_cake.qos'
- option linklayer 'none'
- option interface '0'
- option debug_logging '0'
- option verbosity '5'
-
diff --git a/rooter/0optionalapps/ext-throttle/files/etc/hotplug.d/iface/11-sqm b/rooter/0optionalapps/ext-throttle/files/etc/hotplug.d/iface/11-sqm
deleted file mode 100644
index 75ff4ea..0000000
--- a/rooter/0optionalapps/ext-throttle/files/etc/hotplug.d/iface/11-sqm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-if [ "$ACTION" = ifdown ]; then
- if [ $INTERFACE = "wan" -o $INTERFACE = "wan1" -o $INTERFACE = "wan2" ]; then
- uci set sqm.$INTERFACE.interface='0'
- uci commit sqm
- logger -t THROTTLE-DEBUG "$ACTION $INTERFACE"
- fi
-fi
-
-[ -n "$DEVICE" ] || exit 0
-
-restart_sqm() {
- /usr/lib/sqm/run.sh stop ${DEVICE}
- /usr/lib/sqm/run.sh start ${DEVICE}
-}
-
-if [ "$ACTION" = ifup ]; then
- if [ $INTERFACE = "wan" -o $INTERFACE = "wan1" -o $INTERFACE = "wan2" ]; then
- uci set sqm.$INTERFACE.interface=$DEVICE
- uci commit sqm
- /etc/init.d/sqm enabled
- restart_sqm
- logger -t THROTTLE-DEBUG "$DEVICE $ACTION $INTERFACE"
- fi
-fi
-
diff --git a/rooter/0optionalapps/ext-throttle/files/etc/init.d/sqm b/rooter/0optionalapps/ext-throttle/files/etc/init.d/sqm
deleted file mode 100644
index 3badb62..0000000
--- a/rooter/0optionalapps/ext-throttle/files/etc/init.d/sqm
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-USE_PROCD=1
-
-service_triggers()
-{
- procd_add_reload_trigger "sqm"
-}
-
-reload_service()
-{
- stop "$@"
- start "$@"
-}
-
-start_service()
-{
- /usr/lib/sqm/run.sh start "$@"
-}
-
-stop_service()
-{
- /usr/lib/sqm/run.sh stop "$@"
-}
-
-boot()
-{
- export SQM_VERBOSITY_MIN=5 # Silence errors
- start "$@"
-}
diff --git a/rooter/0optionalapps/ext-throttle/files/etc/sqm/sqm.conf b/rooter/0optionalapps/ext-throttle/files/etc/sqm/sqm.conf
deleted file mode 100644
index b9a98b4..0000000
--- a/rooter/0optionalapps/ext-throttle/files/etc/sqm/sqm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-SQM_LIB_DIR=/usr/lib/sqm
-SQM_STATE_DIR=/var/run/sqm
-SQM_QDISC_STATE_DIR=${SQM_STATE_DIR}/available_qdiscs
-SQM_CHECK_QDISCS="fq_codel codel pie sfq cake"
-SQM_SYSLOG=1
diff --git a/rooter/0optionalapps/ext-throttle/files/etc/uci-defaults/50-luci-sqm b/rooter/0optionalapps/ext-throttle/files/etc/uci-defaults/50-luci-sqm
deleted file mode 100644
index b3aa47c..0000000
--- a/rooter/0optionalapps/ext-throttle/files/etc/uci-defaults/50-luci-sqm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOF >/dev/null
- delete ucitrack.@sqm[-1]
- add ucitrack sqm
- set ucitrack.@sqm[-1].init=sqm
- del_list ucitrack.@firewall[0].affects=sqm
- add_list ucitrack.@firewall[0].affects=sqm
- commit ucitrack
-EOF
-
-exit 0
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/defaults.sh b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/defaults.sh
deleted file mode 100644
index 009cfc6..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/defaults.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-# You need to jiggle these parameters. Note limits are tuned towards a <10Mbit uplink <60Mbup down
-
-[ -z "$SCRIPT" ] && SCRIPT=
-[ -z "$UPLINK" ] && UPLINK=2302
-[ -z "$DOWNLINK" ] && DOWNLINK=14698
-[ -z "$IFACE" ] && IFACE=eth0
-[ -z "$QDISC" ] && QDISC=fq_codel
-[ -z "$LLAM" ] && LLAM="default"
-[ -z "$LINKLAYER" ] && LINKLAYER="none"
-[ -z "$OVERHEAD" ] && OVERHEAD=0
-[ -z "$STAB_MTU" ] && STAB_MTU=2047
-[ -z "$STAB_MPU" ] && STAB_MPU=0
-[ -z "$STAB_TSIZE" ] && STAB_TSIZE=512
-[ -z "$AUTOFLOW" ] && AUTOFLOW=0
-[ -z "$LIMIT" ] && LIMIT=1001 # sane global default for *LIMIT for fq_codel on a small memory device
-[ -z "$ILIMIT" ] && ILIMIT=
-[ -z "$ELIMIT" ] && ELIMIT=
-[ -z "$ITARGET" ] && ITARGET=
-[ -z "$ETARGET" ] && ETARGET=
-[ -z "$IECN" ] && IECN="ECN"
-[ -z "$EECN" ] && EECN="ECN"
-# These two used to be called something else; preserve backwards compatibility
-[ -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=""
-
-# handling of specific important binaries
-[ -z "$TC" ] && TC=tc_wrapper
-[ -z "$TC_BINARY" ] && TC_BINARY=$(command -v tc)
-[ -z "$IP" ] && IP=ip_wrapper
-[ -z "$IP_BINARY" ] && IP_BINARY=$(command -v ip)
-[ -z "$IPTABLES" ] && IPTABLES=iptables_wrapper
-[ -z "$IPTABLES_BINARY" ] && IPTABLES_BINARY=$(command -v iptables)
-[ -z "$IP6TABLES" ] && IP6TABLES=ip6tables_wrapper
-[ -z "$IP6TABLES_BINARY" ] && IP6TABLES_BINARY=$(command -v ip6tables)
-[ -z "$IPTABLES_ARGS" ] && IPTABLES_ARGS="-w 1"
-
-
-# Try modprobe first, fall back to insmod
-if [ -z "$INSMOD" ]; then
- INSMOD=$(command -v modprobe)
- if [ -n "$INSMOD" ]; then
- INSMOD="${INSMOD} -q"
- else
- INSMOD=$(command -v insmod)
- fi
-fi
-
-[ -z "$TARGET" ] && TARGET="5ms"
-[ -z "$IPT_MASK" ] && IPT_MASK="0xff" # to disable: set mask to 0xffffffff
-#sm: we need the functions above before trying to set the ingress IFB device
-#sm: *_CAKE_OPTS should contain the diffserv keyword for cake
-[ -z "$INGRESS_CAKE_OPTS" ] && INGRESS_CAKE_OPTS="diffserv3"
-[ -z "$EGRESS_CAKE_OPTS" ] && EGRESS_CAKE_OPTS="diffserv3"
-
-[ -z "$CUR_DIRECTION" ] && CUR_DIRECTION="NONE"
-
-
-# HTB without a sufficiently large burst/cburst value is a bit CPU hungry
-# so allow to specify the permitted burst in the time domain (microseconds)
-# so the user has a feeling for the associated worst case latency cost
-# set to zero to use htb default butst of one MTU
-[ -z "$SHAPER_BURST_DUR_US" ] && SHAPER_BURST_DUR_US=1000
-[ -z "$ISHAPER_BURST_DUR_US" ] && ISHAPER_BURST_DUR_US=$SHAPER_BURST_DUR_US
-[ -z "$ESHAPER_BURST_DUR_US" ] && ESHAPER_BURST_DUR_US=$SHAPER_BURST_DUR_US
-
-# use the same logic for the calculation of htb's quantum
-# quantum controlls how many bytes htb tries to deque from the current tier
-# before switching tiers.
-[ -z "$SHAPER_QUANTUM_DUR_US" ] && SHAPER_QUANTUM_DUR_US=$SHAPER_BURST_DUR_US
-[ -z "$ISHAPER_QUANTUM_DUR_US" ] && ISHAPER_QUANTUM_DUR_US=$SHAPER_QUANTUM_DUR_US
-[ -z "$ESHAPER_QUANTUM_DUR_US" ] && ESHAPER_QUANTUM_DUR_US=$SHAPER_QUANTUM_DUR_US
-
-
-# Logging verbosity
-VERBOSITY_SILENT=0
-VERBOSITY_ERROR=1
-VERBOSITY_WARNING=2
-VERBOSITY_INFO=5
-VERBOSITY_DEBUG=8
-VERBOSITY_TRACE=10
-[ -z "$SQM_VERBOSITY_MAX" ] && SQM_VERBOSITY_MAX=$VERBOSITY_INFO
-# For silencing only errors
-[ -z "$SQM_VERBOSITY_MIN" ] && SQM_VERBOSITY_MIN=$VERBOSITY_SILENT
-
-[ -z "$SQM_DEBUG" ] && SQM_DEBUG=0
-if [ "$SQM_DEBUG" -eq "1" ]
-then
- SQM_DEBUG_STEM="${SQM_STATE_DIR}/${IFACE}"
- SQM_START_LOG="${SQM_DEBUG_STEM}.start-sqm.log"
- SQM_STOP_LOG="${SQM_DEBUG_STEM}.stop-sqm.log"
- [ -z "SQM_DEBUG_LOG" ] && SQM_DEBUG_LOG="${SQM_DEBUG_STEM}.debug.log"
- OUTPUT_TARGET="${SQM_DEBUG_LOG}"
-else
- OUTPUT_TARGET="/dev/null"
-fi
-
-
-# Can be overridden by callers that want to silence error output for a
-# particular command
-SILENT=0
-
-# Transaction log for unwinding ipt rules
-IPT_TRANS_LOG="${SQM_STATE_DIR}/${IFACE}.iptables.log"
-
-# 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"
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/functions.sh b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/functions.sh
deleted file mode 100644
index c61edfa..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/functions.sh
+++ /dev/null
@@ -1,923 +0,0 @@
-################################################################################
-# (sqm) functions.sh
-#
-# These are all helper functions for various parts of SQM scripts. If you want
-# to play around with your own shaper-qdisc-filter configuration look here for
-# ready made tools, or examples start of on your own.
-#
-# Please note the SQM logger function is broken down into levels of logging.
-# Use only levels appropriate to touch points in your script and realize the
-# potential to overflow SYSLOG.
-#
-################################################################################
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-2019
-# Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-# Eric Luehrsen
-#
-################################################################################
-
-# Logging verbosity
-VERBOSITY_SILENT=0
-VERBOSITY_ERROR=1
-VERBOSITY_WARNING=2
-VERBOSITY_INFO=5
-VERBOSITY_DEBUG=8
-VERBOSITY_TRACE=10
-
-sqm_logger() {
- local level_min
- local level_max
- local debug
-
- case $1 in
- ''|*[!0-9]*) LEVEL=$VERBOSITY_INFO ;; # empty or non-numbers
- *) LEVEL=$1; shift ;;
- esac
-
- level_min=${SQM_VERBOSITY_MIN:-$VERBOSITY_SILENT}
- level_max=${SQM_VERBOSITY_MAX:-$VERBOSITY_INFO}
- debug=${SQM_DEBUG:-0}
-
- if [ "$level_max" -ge "$LEVEL" ] && [ "$level_min" -le "$LEVEL" ] ; then
- if [ "$SQM_SYSLOG" -eq "1" ]; then
- logger -t SQM -s "$*"
- else
- echo "$@" >&2
- fi
- fi
-
- # this writes into SQM_START_LOG or SQM_STOP_LOG, log files are trucated in
- # start-sqm/stop-sqm respectively and should only take little space
- if [ "$debug" -eq "1" ]; then
- echo "$@" >> "${SQM_DEBUG_LOG}"
- fi
-}
-
-sqm_error() { sqm_logger $VERBOSITY_ERROR ERROR: "$@"; }
-sqm_warn() { sqm_logger $VERBOSITY_WARNING WARNING: "$@"; }
-sqm_log() { sqm_logger $VERBOSITY_INFO "$@"; }
-sqm_debug() { sqm_logger $VERBOSITY_DEBUG "$@"; }
-sqm_trace() { sqm_logger $VERBOSITY_TRACE "$@"; }
-
-
-# Inspired from https://stackoverflow.com/questions/85880/determine-if-a-function-exists-in-bash
-#fn_exists() { LC_ALL=C type $1 | grep -q 'is a function'; }
-fn_exists() {
- local FN_CANDIDATE
- local CUR_LC_ALL
- local TYPE_OUTPUT
- local RET
- FN_CANDIDATE=$1
- # check that a candidate nme was given
- if [ -z "${FN_CANDIDATE}" ]; then
- sqm_error "fn_exists: no function name specified as first argument."
- return 1
- fi
- sqm_debug "fn_exists: function candidate name: ${FN_CANDIDATE}"
-
- # extract the textual type description
- TYPE_OUTPUT=$( LC_ALL=C type $1 2>&1 )
- sqm_debug "fn_exists: TYPE_OUTPUT: $TYPE_OUTPUT"
-
- # OpenWrt (2019) returns 'is a function'
- # Debian Buster/raspbian returns 'is a shell function'
- # let's just hope no Linux system reurn 'is a shell builtin function'
- echo ${TYPE_OUTPUT} | grep -q 'is .*function'
- RET=$?
-
- sqm_debug "fn_exists: return value: ${RET}"
- return ${RET}
-}
-
-
-# Transaction logging for ipt rules to allow for gracefull final teardown
-ipt_log_restart() {
- [ -f "$IPT_TRANS_LOG" ] && rm -f "$IPT_TRANS_LOG"
-}
-
-
-# Function to negate iptables commands. Turns addition and insertion into
-# deletion, and creation of new chains into deletion
-# Its output has quotes around all parameters so we can preserve arguments
-# containing whitespace across log file write & re-read
-ipt_negate()
-{
- for var in "$@"; do
- case "$var" in
- "-A"|"-I") echo -n '"-D" ' ;;
- "-N") echo -n '"-X" ' ;;
- *) echo -n "\"$var\" " ;;
- esac
- done
- echo ""
-}
-
-ipt_log()
-{
- echo "$@" >> $IPT_TRANS_LOG
-}
-
-# Split a string containing an iptables command line parameter invocation, then
-# run it through ipt(). This is used to turn lines read from the log file, or
-# output from ipt_negate() back into proper parameters contained in $@
-ipt_run_split()
-{
- eval "set -- $1"
- ipt "$@"
-}
-
-# Read the transaction log in reverse and execute using ipt to undo changes.
-# Since we logged only ipt '-D' commands, ipt won't add them again to the
-# transaction log, but will include them in the syslog/debug log.
-ipt_log_rewind() {
- [ -f "$IPT_TRANS_LOG" ] || return 0
- sed -n '1!G;h;$p' "$IPT_TRANS_LOG" |
- while read line; do
- [ -n "$line" ] || continue
- ipt_run_split "$line"
- done
-}
-
-ipt() {
- local neg
-
- for var in "$@"; do
- case "$var" in
- "-A"|"-I"|"-N")
- # If the rule is an addition rule, we first run its negation,
- # then log that negation to be used by ipt_log_rewind() on
- # shutdown
- neg="$(ipt_negate "$@")"
- ipt_run_split "$neg"
- ipt_log "$neg"
- ;;
- esac
- done
-
- SILENT=1 ${IPTABLES} $IPTABLES_ARGS "$@"
- SILENT=1 ${IP6TABLES} $IPTABLES_ARGS "$@"
-}
-
-
-# wrapper to call iptables to allow debug logging
-iptables_wrapper(){
- cmd_wrapper iptables ${IPTABLES_BINARY} "$@"
-}
-
-# wrapper to call ip6tables to allow debug logging
-ip6tables_wrapper(){
- cmd_wrapper ip6tables ${IP6TABLES_BINARY} "$@"
-}
-
-# wrapper to call tc to allow debug logging
-tc_wrapper(){
- cmd_wrapper tc ${TC_BINARY} "$@"
-}
-
-# wrapper to call ip to allow debug logging
-ip_wrapper(){
- cmd_wrapper ip ${IP_BINARY} "$@"
-}
-
-# the actual command execution wrapper
-cmd_wrapper(){
- # $1: the symbolic name of the command for informative output
- # $2: the name of the binary to call (potentially including the full path)
- # $3-$end: the actual arguments for $2
- local CALLERID
- local CMD_BINARY
- local LAST_ERROR
- local RET
- local ERRLOG
-
- CALLERID=$1 ; shift 1 # extract and remove the id string
- CMD_BINARY=$1 ; shift 1 # extract and remove the binary
-
- # Handle silencing of errors from callers
- ERRLOG="sqm_error"
- if [ "$SILENT" -eq "1" ]; then
- ERRLOG="sqm_debug"
- sqm_debug "cmd_wrapper: ${CALLERID}: invocation silenced by request, FAILURE either expected or acceptable."
- # The busybox shell doesn't understand the concept of an inline variable
- # only applying to a single command, so we need to reset SILENT
- # afterwards. Ugly, but it works...
- SILENT=0
- fi
-
- sqm_trace "cmd_wrapper: COMMAND: ${CMD_BINARY} $@"
- LAST_ERROR=$( ${CMD_BINARY} "$@" 2>&1 )
- RET=$?
-
- if [ "$RET" -eq "0" ] ; then
- sqm_debug "cmd_wrapper: ${CALLERID}: SUCCESS: ${CMD_BINARY} $@"
- else
- # this went south, try to capture & report more detail
- $ERRLOG "cmd_wrapper: ${CALLERID}: FAILURE (${RET}): ${CMD_BINARY} $@"
- $ERRLOG "cmd_wrapper: ${CALLERID}: LAST ERROR: ${LAST_ERROR}"
- fi
-
- return $RET
-}
-
-
-do_modules() {
- for m in $ALL_MODULES; do
- [ -d /sys/module/${m} ] || ${INSMOD} $m 2>>${OUTPUT_TARGET}
- done
-}
-
-# Write a state file to the filename given as $1. This version will extract all
-# variable names defined in defaults.sh and since defaults.sh should contain all
-# used variables this should be the complete set.
-write_state_file() {
- local filename
- local awkscript
- awkscript='match($0, /[A-Z0-9_]+=/) {print substr($0, RSTART, RLENGTH-1)}'
- filename=$1
- shift
- awk "$awkscript" ${SQM_LIB_DIR}/defaults.sh | sort -u | while read var; do
- val=$(eval echo '$'$var)
- echo "$var=\"$val\""
- done > $filename
-}
-
-check_state_dir() {
- local PERM
- local OWNER
-
- if [ -z "${SQM_STATE_DIR}" ]; then
- SQM_DEBUG=0 sqm_error '$SQM_STATE_DIR is unset - check your config!'
- exit 1
- fi
- [ -d "${SQM_STATE_DIR}" ] || ( umask 077; mkdir -p "$SQM_STATE_DIR" ) || exit 1
-
- if [ ! -w "${SQM_STATE_DIR}" ] || [ ! -x "${SQM_STATE_DIR}" ]; then
- SQM_DEBUG=0 sqm_error "Cannot write to state dir '$SQM_STATE_DIR'"
- exit 1
- fi
-
- # OpenWrt doesn't have stat; for now just skip the remaining tests if it's
- # not available
- command -v stat >/dev/null 2>&1 || return 0
-
- PERM="0$(stat -L -c '%a' "${SQM_STATE_DIR}")"
- if [ "$((PERM & 0002))" -ne 0 ]; then
- SQM_DEBUG=0 sqm_error "State dir '$SQM_STATE_DIR' is world writable; this is unsafe, please fix"
- exit 1
- fi
- OWNER="$(stat -L -c '%u' "${SQM_STATE_DIR}")"
- if [ "$OWNER" -ne "$(id -u)" ]; then
- SQM_DEBUG=0 sqm_error "State dir '$SQM_STATE_DIR' is owned by a different user; this is unsafe, please fix"
- exit 1
- fi
-}
-
-
-# find the ifb device associated with a specific interface, return nothing of no
-# ifb is associated with IF
-get_ifb_associated_with_if() {
- local CUR_IF
- local CUR_IFB
- local TMP
- CUR_IF=$1
- # Stray ' in the comment is a fix for broken editor syntax highlighting
- CUR_IFB=$( $TC_BINARY -p filter show parent ffff: dev ${CUR_IF} | grep -o -E ifb'[^)\ ]+' ) # '
- sqm_debug "ifb associated with interface ${CUR_IF}: ${CUR_IFB}"
-
- # we could not detect an associated IFB for CUR_IF
- if [ -z "${CUR_IFB}" ]; then
- TMP=$( $TC_BINARY -p filter show parent ffff: dev ${CUR_IF} )
- if [ ! -z "${TMP}" ]; then
- # oops, there is output but we failed to properly parse it? Ask for a user report
- sqm_error "#---- CUT HERE ----#"
- sqm_error "get_ifb_associated_with_if failed to extrect the ifb name from:"
- sqm_error $( $TC_BINARY -p filter show parent ffff: dev ${CUR_IF} )
- sqm_error "Please report this as an issue at https://github.com/tohojo/sqm-scripts"
- sqm_error "Please copy and paste everything below the cut-here line into your issue report, thanks."
- else
- sqm_debug "Currently no ifb is associated with ${CUR_IF}, this is normal during starting of the sqm system."
- fi
- fi
- echo ${CUR_IFB}
-}
-
-ifb_name() {
- local CUR_IF
- local MAX_IF_NAME_LENGTH
- local IFB_PREFIX
- local NEW_IFB
- CUR_IF=$1
- MAX_IF_NAME_LENGTH=15
- IFB_PREFIX="ifb4"
- NEW_IFB=$( echo -n "${IFB_PREFIX}${CUR_IF}" | head -c $MAX_IF_NAME_LENGTH )
-
- echo ${NEW_IFB}
-}
-
-# if required
-create_new_ifb_for_if() {
- local NEW_IFB
- NEW_IFB=$(ifb_name $1)
- create_ifb ${NEW_IFB}
- RET=$?
- echo $NEW_IFB
- return $RET
-}
-
-
-# TODO: report failures
-create_ifb() {
- local CUR_IFB
- CUR_IFB=${1}
- $IP link add name ${CUR_IFB} type ifb
-}
-
-delete_ifb() {
- local CUR_IFB
- CUR_IFB=${1}
- $IP link set dev ${CUR_IFB} down
- $IP link delete ${CUR_IFB} type ifb
-}
-
-
-# the best match is either the IFB already associated with the current interface
-# or a new named IFB
-get_ifb_for_if() {
- local CUR_IF
- local CUR_IFB
- CUR_IF=$1
- # if an ifb is already associated return that
- CUR_IFB=$( get_ifb_associated_with_if ${CUR_IF} )
- [ -z "$CUR_IFB" ] && CUR_IFB=$( create_new_ifb_for_if ${CUR_IF} )
- [ -z "$CUR_IFB" ] && sqm_warn "Could not find existing IFB for ${CUR_IF}, nor create a new IFB instead..."
- echo ${CUR_IFB}
-}
-
-
-# Verify that a qdisc works, and optionally that it is part of a set of
-# supported qdiscs. If passed a $2, this function will first check if $1 is in
-# that (space-separated) list and return an error if it's not.
-#
-# note the ingress qdisc is different in that it requires tc qdisc replace dev
-# tmp_ifb ingress instead of "root ingress"
-verify_qdisc() {
- local qdisc
- local supported
- local ifb
- local root_string
- local args
- local IFB_MTU
- local found
- local randnum
- qdisc=$1
- supported="$2"
- randnum=$(tr -cd 0-9a-f < /dev/urandom 2>/dev/null | head -c 5)
- ifb=SQM_IFB_$randnum
- root_string="root" # this works for most qdiscs
- args=""
- IFB_MTU=1514
-
- if [ -n "$supported" ]; then
- found=0
- for q in $supported; do
- [ "$qdisc" = "$q" ] && found=1
- done
- [ "$found" -eq "1" ] || return 1
- fi
- create_ifb $ifb || return 1
-
-
- case $qdisc in
- #ingress is special
- ingress) root_string="" ;;
- #cannot instantiate tbf without args
- tbf)
- IFB_MTU=$( get_mtu $ifb )
- IFB_MTU=$(( ${IFB_MTU} + 14 )) # TBF's warning is confused, it says MTU but it checks MTU + 14
- args="limit 1 burst ${IFB_MTU} rate 1kbps"
- ;;
- esac
-
- $TC qdisc replace dev $ifb $root_string $qdisc $args
- res=$?
- if [ "$res" = "0" ] ; then
- sqm_debug "QDISC $qdisc is useable."
- else
- sqm_error "QDISC $qdisc is NOT useable."
- fi
- delete_ifb $ifb
- return $res
-}
-
-
-get_htb_adsll_string() {
- ADSLL=""
- if [ "$LLAM" = "htb_private" -a "$LINKLAYER" != "none" ]; then
- # HTB defaults to MTU 1600 and an implicit fixed TSIZE of 256, but HTB
- # as of around 3.10.0 does not actually use a table in the kernel
- ADSLL="mpu ${STAB_MPU} linklayer ${LINKLAYER} overhead ${OVERHEAD} mtu ${STAB_MTU}"
- sqm_debug "ADSLL: ${ADSLL}"
- fi
- echo ${ADSLL}
-}
-
-get_stab_string() {
- local STABSTRING
- local TMP_LLAM
- STABSTRING=""
- TMP_LLAM=${LLAM}
- if [ "${LLAM}" = "default" -a "$QDISC" != "cake" ]; then
- sqm_debug "LLA: default link layer adjustment method for !cake is tc_stab"
- TMP_LLAM="tc_stab"
- fi
-
- if [ "${TMP_LLAM}" = "tc_stab" -a "$LINKLAYER" != "none" ]; then
- STABSTRING="stab mtu ${STAB_MTU} tsize ${STAB_TSIZE} mpu ${STAB_MPU} overhead ${OVERHEAD} linklayer ${LINKLAYER}"
- sqm_debug "STAB: ${STABSTRING}"
- fi
- echo ${STABSTRING}
-}
-
-# cake knows how to handle ATM and per packet overhead, so expose and use this...
-get_cake_lla_string() {
- local STABSTRING
- local TMP_LLAM
- STABSTRING=""
- TMP_LLAM=${LLAM}
- if [ "${LLAM}" = "default" -a "$QDISC" = "cake" ]; then
- sqm_debug "LLA: default link layer adjustment method for cake is cake"
- TMP_LLAM="cake"
- fi
-
- if [ "${TMP_LLAM}" = "cake" -a "${LINKLAYER}" != "none" ]; then
- if [ "${LINKLAYER}" = "atm" ]; then
- STABSTRING="atm"
- fi
-
- STABSTRING="${STABSTRING} overhead ${OVERHEAD} mpu ${STAB_MPU}"
-
- sqm_debug "cake link layer adjustments: ${STABSTRING}"
- fi
- echo ${STABSTRING}
-}
-
-
-# centralize the implementation for the default sqm_start sqeuence
-# the individual sqm_start function only need to do the individually
-# necessary checking.
-# This expects the calling script to supply both an egress() and ingress() function
-# and will warn if they are missing
-sqm_start_default() {
- #sqm_error "sqm_start_default"
- [ -n "$IFACE" ] || return 1
-
- # reset the iptables trace log
- ipt_log_restart
-
- if fn_exists sqm_prepare_script ; then
- sqm_debug "sqm_start_default: starting sqm_prepare_script"
- sqm_prepare_script
- else
- sqm_debug "sqm_start_default: no sqm_prepare_script function found, proceeding without."
- fi
-
- do_modules
- verify_qdisc $QDISC || return 1
- sqm_debug "sqm_start_default: Starting ${SCRIPT}"
-
- [ -z "$DEV" ] && DEV=$( get_ifb_for_if ${IFACE} )
-
- if [ "${UPLINK}" -ne 0 ];
- then
- CUR_DIRECTION="egress"
- fn_exists egress && egress || sqm_warn "sqm_start_default: ${SCRIPT} lacks an egress() function"
- #egress
- sqm_debug "sqm_start_default: egress shaping activated"
- else
- sqm_debug "sqm_start_default: egress shaping deactivated"
- SILENT=1 $TC qdisc del dev ${IFACE} root
- fi
- if [ "${DOWNLINK}" -ne 0 ];
- then
- CUR_DIRECTION="ingress"
- verify_qdisc ingress "ingress" || return 1
- fn_exists ingress && ingress || sqm_warn "sqm_start_default: ${SCRIPT} lacks an ingress() function"
- #ingress
- sqm_debug "sqm_start_default: ingress shaping activated"
- else
- sqm_debug "sqm_start_default: ingress shaping deactivated"
- SILENT=1 $TC qdisc del dev ${DEV} root
- SILENT=1 $TC qdisc del dev ${IFACE} ingress
- fi
-
- return 0
-}
-
-
-sqm_stop() {
- if [ "${DOWNLINK}" -ne 0 ]; then
- $TC qdisc del dev $IFACE ingress
- $TC qdisc del dev $IFACE root
- [ -n "$CUR_IFB" ] && $TC qdisc del dev $CUR_IFB root
- [ -n "$CUR_IFB" ] && sqm_debug "${0}: ${CUR_IFB} shaper deleted"
- fi
-
- # undo accumulated ipt commands during shutdown
- ipt_log_rewind
- # reset the iptables trace log
- ipt_log_restart
-
- [ -n "$CUR_IFB" ] && $IP link set dev ${CUR_IFB} down
- [ -n "$CUR_IFB" ] && $IP link delete ${CUR_IFB} type ifb
- [ -n "$CUR_IFB" ] && sqm_debug "${0}: ${CUR_IFB} interface deleted"
-}
-
-# Note this has side effects on the prio variable
-# and depends on the interface global too
-fc() {
- $TC filter add dev $interface protocol ip parent $1 prio $prio u32 match ip tos $2 0xfc classid $3
- prio=$(($prio + 1))
- $TC filter add dev $interface protocol ipv6 parent $1 prio $prio u32 match ip6 priority $2 0xfc classid $3
- prio=$(($prio + 1))
-}
-
-
-# allow better control over HTB's quantum variable
-# this controlls how many bytes htb ties to deque from the current tier before
-# switching to the next, if this is large mixing between pririty tiers will be
-# lumpy, but at a lower CPU cost. In first approximation quantum should not be
-# larger than burst.
-get_htb_quantum() {
- local HTB_MTU
- local BANDWIDTH
- local DURATION_US
- local MIN_QUANTUM
- local QUANTUM
- HTB_MTU=$( get_mtu $1 )
- BANDWIDTH=$2
- DURATION_US=$3
-
- sqm_debug "get_htb_quantum: 1: ${1}, 2: ${2}, 3: ${3}"
-
- if [ -z "${DURATION_US}" ] ; then
- DURATION_US=${SHAPER_QUANTUM_DUR_US} # the duration of the burst in microseconds
- sqm_warn "get_htb_quantum (by duration): Defaulting to ${DURATION_US} microseconds."
- fi
-
- if [ -n "${HTB_MTU}" -a "${DURATION_US}" -gt "0" ] ; then
- QUANTUM=$( get_burst ${HTB_MTU} ${BANDWIDTH} ${DURATION_US} )
- fi
-
- if [ -z "$QUANTUM" ]; then
- MIN_QUANTUM=$(( ${MTU} + 48 )) # add 48 bytes to MTU for the ovehead
- MIN_QUANTUM=$(( ${MIN_QUANTUM} + 47 )) # now do ceil(Min_BURST / 48) * 53 in shell integer arithmic
- MIN_QUANTUM=$(( ${MIN_QUANTUM} / 48 ))
- MIN_QUANTUM=$(( ${MIN_QUANTUM} * 53 )) # for MTU 1489 to 1536 this will result in MIN_BURST = 1749 Bytes
- sqm_warn "get_htb_quantum: 0 bytes quantum will not work, defaulting to one ATM/AAL5 expanded MTU packet with overhead: ${MIN_QUANTUM}"
- echo ${MIN_QUANTUM}
- else
- echo ${QUANTUM}
- fi
-}
-
-
-
-
-# try to define the burst parameter in the duration required to transmit a burst
-# at the configured bandwidth conceptuallly the matching quantum for this burst
-# should be BURST/number_of_tiers to give each htb tier a chance to dequeue into
-# each burst, but that most likely will end up with a somewhat too small quantum
-# note: to get htb to report the configured burst/cburt one needs to issue the
-# following command (for ifbpppoe-wan):
-# tc -d class show dev ifb4pppoe-wan
-get_burst() {
- local MTU
- local BANDWIDTH
- local SHAPER_BURST_US
- local MIN_BURST
- local BURST
- MTU=$1
- BANDWIDTH=$2 # note bandwidth is always given in kbps
- SHAPER_BURST_US=$3
-
- sqm_debug "get_burst: 1: ${1}, 2: ${2}, 3: ${3}"
-
- if [ -z "${SHAPER_BURST_US}" ] ; then
- SHAPER_BURST_US=1000 # the duration of the burst in microseconds
- sqm_warn "get_burst (by duration): Defaulting to ${SHAPER_BURST_US} microseconds bursts."
- fi
-
- # let's assume ATM/AAL5 to be the worst case encapsulation
- # and 48 Bytes a reasonable worst case per packet overhead
- MIN_BURST=$(( ${MTU} + 48 )) # add 48 bytes to MTU for the ovehead
- MIN_BURST=$(( ${MIN_BURST} + 47 )) # now do ceil(Min_BURST / 48) * 53 in shell integer arithmic
- MIN_BURST=$(( ${MIN_BURST} / 48 ))
- MIN_BURST=$(( ${MIN_BURST} * 53 )) # for MTU 1489 to 1536 this will result in MIN_BURST = 1749 Bytes
-
- # htb/tbf expect burst to be specified in bytes, while bandwidth is in kbps
- BURST=$(( ((${SHAPER_BURST_US} * ${BANDWIDTH}) / 8000) ))
-
- if [ ${BURST} -lt ${MIN_BURST} ] ; then
- sqm_log "get_burst (by duration): the calculated burst/quantum size of ${BURST} bytes was below the minimum of ${MIN_BURST} bytes."
- BURST=${MIN_BURST}
- fi
-
- sqm_debug "get_burst (by duration): BURST [Byte]: ${BURST}, BANDWIDTH [Kbps]: ${BANDWIDTH}, DURATION [us]: ${SHAPER_BURST_US}"
-
- echo ${BURST}
-}
-
-
-# Create optional burst parameters to leap over CPU interupts when the CPU is
-# severly loaded. We need to be conservative though.
-get_htb_burst() {
- local HTB_MTU
- local BANDWIDTH
- local DURATION_US
- local BURST
- HTB_MTU=$( get_mtu $1 )
- BANDWIDTH=$2
- DURATION_US=$3
-
- sqm_debug "get_htb_burst: 1: ${1}, 2: ${2}, 3: ${3}"
-
- if [ -z "${DURATION_US}" ] ; then
- DURATION_US=${SHAPER_BURST_DUR_US} # the duration of the burst in microseconds
- sqm_warn "get_htb_burst (by duration): Defaulting to ${SHAPER_BURST_DUR_US} microseconds."
- fi
-
- if [ -n "${HTB_MTU}" -a "${DURATION_US}" -gt "0" ] ; then
- BURST=$( get_burst ${HTB_MTU} ${BANDWIDTH} ${DURATION_US} )
- fi
-
- if [ -z "$BURST" ]; then
- sqm_debug "get_htb_burst: Default Burst, HTB will use MTU plus shipping and handling"
- else
- echo burst $BURST cburst $BURST
- fi
-}
-
-# For a default PPPoE link this returns 1492 just as expected but I fear we
-# actually need the wire size of the whole thing not so much the MTU
-get_mtu() {
- CUR_MTU=$(cat /sys/class/net/$1/mtu)
- sqm_debug "IFACE: ${1} MTU: ${CUR_MTU}"
- echo ${CUR_MTU}
-}
-
-# Set the autoflow variable to 1 if you want to limit the number of flows
-# otherwise the default of 1024 will be used for all Xfq_codel qdiscs.
-
-get_flows() {
- case $QDISC in
- codel|ns2_codel|pie|*fifo|pfifo_fast) ;;
- fq_codel|*fq_codel|sfq) echo flows $( get_flows_count ${1} ) ;;
- esac
-}
-
-get_flows_count() {
- if [ "${AUTOFLOW}" -eq "1" ]; then
- FLOWS=8
- [ $1 -gt 999 ] && FLOWS=16
- [ $1 -gt 2999 ] && FLOWS=32
- [ $1 -gt 7999 ] && FLOWS=48
- [ $1 -gt 9999 ] && FLOWS=64
- [ $1 -gt 19999 ] && FLOWS=128
- [ $1 -gt 39999 ] && FLOWS=256
- [ $1 -gt 69999 ] && FLOWS=512
- [ $1 -gt 99999 ] && FLOWS=1024
- case $QDISC in
- codel|ns2_codel|pie|*fifo|pfifo_fast) ;;
- fq_codel|*fq_codel|sfq) echo $FLOWS ;;
- esac
- else
- case $QDISC in
- codel|ns2_codel|pie|*fifo|pfifo_fast) ;;
- fq_codel|*fq_codel|sfq) echo 1024 ;;
- esac
- fi
-}
-
-# set the target parameter, also try to only take well formed inputs
-# Note, the link bandwidth in the current direction (ingress or egress)
-# is required to adjust the target for slow links
-get_target() {
- local CUR_TARGET
- local CUR_LINK_KBPS
- CUR_TARGET=${1}
- CUR_LINK_KBPS=${2}
- [ ! -z "$CUR_TARGET" ] && sqm_debug "cur_target: ${CUR_TARGET} cur_bandwidth: ${CUR_LINK_KBPS}"
- CUR_TARGET_STRING=
- # either e.g. 100ms or auto
- CUR_TARGET_VALUE=$( echo ${CUR_TARGET} | grep -o -e \^'[[:digit:]]\+' )
- CUR_TARGET_UNIT=$( echo ${CUR_TARGET} | grep -o -e '[[:alpha:]]\+'\$ )
-
- AUTO_TARGET=
- UNIT_VALID=
-
- case $QDISC in
- *codel|*pie)
- if [ ! -z "${CUR_TARGET_VALUE}" -a ! -z "${CUR_TARGET_UNIT}" ];
- then
- case ${CUR_TARGET_UNIT} in
- # permissible units taken from: tc_util.c get_time()
- s|sec|secs|ms|msec|msecs|us|usec|usecs)
- CUR_TARGET_STRING="target ${CUR_TARGET_VALUE}${CUR_TARGET_UNIT}"
- UNIT_VALID="1"
- ;;
- esac
- fi
- # empty field in GUI or undefined GUI variable now defaults to auto
- if [ -z "${CUR_TARGET_VALUE}" -a -z "${CUR_TARGET_UNIT}" ];
- then
- if [ ! -z "${CUR_LINK_KBPS}" ]; then
- TMP_TARGET_US=$( adapt_target_to_slow_link $CUR_LINK_KBPS )
- TMP_INTERVAL_STRING=$( adapt_interval_to_slow_link $TMP_TARGET_US )
- CUR_TARGET_STRING="target ${TMP_TARGET_US}us ${TMP_INTERVAL_STRING}"
- AUTO_TARGET="1"
- sqm_debug "get_target defaulting to auto."
- else
- sqm_warn "required link bandwidth in kbps not passed to get_target()."
- fi
- fi
- # but still allow explicit use of the keyword auto for backward compatibility
- case ${CUR_TARGET_UNIT} in
- auto|Auto|AUTO)
- if [ ! -z "${CUR_LINK_KBPS}" ]; then
- TMP_TARGET_US=$( adapt_target_to_slow_link $CUR_LINK_KBPS )
- TMP_INTERVAL_STRING=$( adapt_interval_to_slow_link $TMP_TARGET_US )
- CUR_TARGET_STRING="target ${TMP_TARGET_US}us ${TMP_INTERVAL_STRING}"
- AUTO_TARGET="1"
- else
- sqm_warn "required link bandwidth in kbps not passed to get_target()."
- fi
- ;;
- esac
-
- case ${CUR_TARGET_UNIT} in
- default|Default|DEFAULT)
- if [ ! -z "${CUR_LINK_KBPS}" ]; then
- CUR_TARGET_STRING="" # return nothing so the default target is not over-ridden...
- AUTO_TARGET="1"
- sqm_debug "get_target using qdisc default, no explicit target string passed."
- else
- sqm_warn "required link bandwidth in kbps not passed to get_target()."
- fi
- ;;
- esac
- if [ ! -z "${CUR_TARGET}" ]; then
- if [ -z "${CUR_TARGET_VALUE}" -o -z "${UNIT_VALID}" ]; then
- [ -z "$AUTO_TARGET" ] && sqm_warn "${CUR_TARGET} is not a well formed tc target specifier; e.g.: 5ms (or s, us), or one of the strings auto or default."
- fi
- fi
- ;;
- esac
- echo $CUR_TARGET_STRING
-}
-
-# for low bandwidth links fq_codels default target of 5ms does not work too well
-# so increase target for slow links (note below roughly 2500kbps a single packet
-# will take more than 5 ms to be tansfered over the wire)
-adapt_target_to_slow_link() {
- LINK_BW=$1
- # for ATM the worst case expansion including overhead seems to be 33 clls of
- # 53 bytes each
- MAX_DELAY=$(( 1000 * 1000 * 33 * 53 * 8 / 1000 )) # Max delay in us at 1kbps
- TARGET=$(( ${MAX_DELAY} / ${LINK_BW} )) # note this truncates the decimals
-
- # do not change anything for fast links
- [ "$TARGET" -lt 5000 ] && TARGET=5000
- case ${QDISC} in
- *codel|pie)
- echo "${TARGET}"
- ;;
- esac
-}
-
-# codel looks at a whole interval to figure out wether observed latency stayed
-# below target if target >= interval that will not work well, so increase
-# interval by the same amonut that target got increased
-adapt_interval_to_slow_link() {
- TARGET=$1
- case ${QDISC} in
- *codel)
- # Note this is not following codel theory to well as target should
- # be 5-10% of interval and the simple addition does not conserve
- # that relationship
- INTERVAL=$(( (100 - 5) * 1000 + ${TARGET} ))
- echo "interval ${INTERVAL}us"
- ;;
- pie)
- ## not sure if pie needs this, probably not
- #TUPDATE=$(( (30 - 20) * 1000 + ${TARGET} ))
- #echo "tupdate ${TUPDATE}us"
- ;;
- esac
-}
-
-
-# set quantum parameter if available for this qdisc
-get_quantum() {
- case $QDISC in
- *fq_codel|fq_pie|drr) echo quantum $1 ;;
- *) ;;
- esac
-}
-
-# only show limits to qdiscs that can handle them...
-# Note that $LIMIT contains the default limit
-get_limit() {
- CURLIMIT=$1
- case $QDISC in
- *codel|*pie|pfifo_fast|sfq|pfifo) [ -z ${CURLIMIT} ] && CURLIMIT=${LIMIT} # global default limit
- ;;
- bfifo) [ -z "$CURLIMIT" ] && [ ! -z "$LIMIT" ] && CURLIMIT=$(( ${LIMIT} * $( cat /sys/class/net/${IFACE}/mtu ) )) # bfifo defaults to txquelength * MTU,
- ;;
- *) sqm_warn "qdisc ${QDISC} does not support a limit"
- ;;
- esac
- sqm_debug "get_limit: $1 CURLIMIT: ${CURLIMIT}"
-
- if [ ! -z "$CURLIMIT" ]; then
- echo "limit ${CURLIMIT}"
- fi
-}
-
-get_ecn() {
- CURECN=$1
- case ${CURECN} in
- ECN)
- case $QDISC in
- *codel|*pie|*red)
- CURECN=ecn
- ;;
- *)
- CURECN=""
- ;;
- esac
- ;;
- NOECN)
- case $QDISC in
- *codel|*pie|*red)
- CURECN=noecn
- ;;
- *)
- CURECN=""
- ;;
- esac
- ;;
- *)
- sqm_warn "ecn value $1 not handled"
- ;;
- esac
- sqm_debug "get_ECN: $1 CURECN: ${CURECN} IECN: ${IECN} EECN: ${EECN}"
- echo ${CURECN}
-
-}
-
-# This could be a complete diffserv implementation
-
-diffserv() {
-
- interface=$1
- prio=1
-
- # Catchall
-
- $TC filter add dev $interface parent 1:0 protocol all prio 999 u32 \
- match ip protocol 0 0x00 flowid 1:12
-
- # Find the most common matches fast
-
- fc 1:0 0x00 1:12 # BE
- fc 1:0 0x20 1:13 # CS1
- fc 1:0 0x10 1:11 # IMM
- fc 1:0 0xb8 1:11 # EF
- fc 1:0 0xc0 1:11 # CS3
- fc 1:0 0xe0 1:11 # CS6
- fc 1:0 0x90 1:11 # AF42 (mosh)
-
- # Arp traffic
- $TC filter add dev $interface protocol arp parent 1:0 prio $prio handle 500 fw flowid 1:11
-
- prio=$(($prio + 1))
-}
-
-eth_setup() {
- ethtool -K $IFACE gso off
- ethtool -K $IFACE tso off
- ethtool -K $IFACE ufo off
- ethtool -K $IFACE gro off
-
- if [ -e /sys/class/net/$IFACE/queues/tx-0/byte_queue_limits ]; then
- for i in /sys/class/net/$IFACE/queues/tx-*/byte_queue_limits
- do
- echo $(( 4 * $( get_mtu ${IFACE} ) )) > $i/limit_max
- done
- fi
-}
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos
deleted file mode 100644
index 27d8163..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos
+++ /dev/null
@@ -1,52 +0,0 @@
-# Cero3 Shaper
-# A cake shaper and AQM solution that allows several diffserv marking schemes
-# for ethernet gateways
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-5 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-
-#sm: TODO pass in the cake diffserv keyword
-
-. ${SQM_LIB_DIR}/defaults.sh
-QDISC=cake
-
-# Default traffic classication is passed in INGRESS_CAKE_OPTS and EGRESS_CAKE_OPTS, defined in defaults.sh now
-
-
-egress() {
- SILENT=1 $TC qdisc del dev $IFACE root
- $TC qdisc add dev $IFACE root $( get_stab_string ) cake \
- bandwidth ${UPLINK}kbit $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}
-
-}
-
-
-ingress() {
-
- SILENT=1 $TC qdisc del dev $IFACE handle ffff: ingress
- $TC qdisc add dev $IFACE handle ffff: ingress
-
- SILENT=1 $TC qdisc del dev $DEV root
-
- [ "$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}
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to ifb0
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-}
-
-sqm_prepare_script() {
- do_modules
- verify_qdisc $QDISC "cake" || return 1
-}
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos.help b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos.help
deleted file mode 100644
index 1cab3ed..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/layer_cake.qos.help
+++ /dev/null
@@ -1,4 +0,0 @@
-This uses the cake qdisc as a replacement for both htb as shaper and fq_codel as leaf qdisc.
-This exercises cake's diffserv profile(s) as different "layers" of priority.
-This script requires that cake is selected as qdisc, and forces its usage.
-See: http://www.bufferbloat.net/projects/codel/wiki/Cake for more information
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos
deleted file mode 100644
index ac65eda..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos
+++ /dev/null
@@ -1,52 +0,0 @@
-# Cero3 Simple Shaper
-# A 1 tin cake shaper for
-# ethernet gateways. This is nearly the simplest possible
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-5 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-
-. ${SQM_LIB_DIR}/defaults.sh
-QDISC=cake
-
-
-# to keep this as simple as possible we ignore the *_CAKE_OPTS from defaults.sh
-INGRESS_CAKE_OPTS="besteffort"
-EGRESS_CAKE_OPTS="besteffort"
-
-
-egress() {
- sqm_debug "egress"
- SILENT=1 $TC qdisc del dev $IFACE root
- $TC qdisc add dev $IFACE root $( get_stab_string ) cake \
- bandwidth ${UPLINK}kbit $( get_cake_lla_string ) ${EGRESS_CAKE_OPTS} ${EQDISC_OPTS}
-}
-
-
-ingress() {
- sqm_debug "ingress"
-
- SILENT=1 $TC qdisc del dev $IFACE handle ffff: ingress
- $TC qdisc add dev $IFACE handle ffff: ingress
- SILENT=1 $TC qdisc del dev $DEV root
-
- [ "$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}
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to ifb0
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-}
-
-sqm_prepare_script() {
- do_modules
- verify_qdisc $QDISC "cake" || return 1
-}
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos.help b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos.help
deleted file mode 100644
index b95e9be..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/piece_of_cake.qos.help
+++ /dev/null
@@ -1,4 +0,0 @@
-This just uses the cake qdisc as a replacement for both htb as shaper and fq_codel as leaf qdisc.
-It just does not come any simpler than this, in other words it truely is a "piece of cake".
-This script requires that cake is selected as qdisc, and forces its usage.
-See: http://www.bufferbloat.net/projects/codel/wiki/Cake for more information
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/run.sh b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/run.sh
deleted file mode 100644
index 6f55ca7..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/run.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-
-. /lib/functions.sh
-
-. /etc/sqm/sqm.conf
-. ${SQM_LIB_DIR}/functions.sh
-
-ACTION="${1:-start}"
-RUN_IFACE="$2"
-LOCKDIR="${SQM_STATE_DIR}/sqm-run.lock"
-
-check_state_dir
-[ -d "${SQM_QDISC_STATE_DIR}" ] || ${SQM_LIB_DIR}/update-available-qdiscs
-
-stop_statefile() {
- local f
- f="$1"
- # Source the state file prior to stopping; we need the variables saved in
- # there.
- [ -f "$f" ] && ( . "$f";
- IFACE=$IFACE SCRIPT=$SCRIPT SQM_DEBUG=$SQM_DEBUG \
- SQM_DEBUG_LOG=$SQM_DEBUG_LOG \
- SQM_VERBOSITY_MAX=$SQM_VERBOSITY_MAX \
- SQM_VERBOSITY_MIN=$SQM_VERBOSITY_MIN \
- OUTPUT_TARGET=$OUTPUT_TARGET ${SQM_LIB_DIR}/stop-sqm )
-}
-
-start_sqm_section() {
- local section
- section="$1"
- export IFACE=$(config_get "$section" interface)
-
- [ -z "$RUN_IFACE" -o "$RUN_IFACE" = "$IFACE" ] || return
- [ "$(config_get "$section" enabled)" -eq 1 ] || return 0
- [ -f "${SQM_STATE_DIR}/${IFACE}.state" ] && return
-
- export UPLINK=$(config_get "$section" upload)
- export DOWNLINK=$(config_get "$section" download)
- export LLAM=$(config_get "$section" linklayer_adaptation_mechanism)
- export LINKLAYER=$(config_get "$section" linklayer)
- export OVERHEAD=$(config_get "$section" overhead)
- export STAB_MTU=$(config_get "$section" tcMTU)
- export STAB_TSIZE=$(config_get "$section" tcTSIZE)
- export STAB_MPU=$(config_get "$section" tcMPU)
- export ILIMIT=$(config_get "$section" ilimit)
- export ELIMIT=$(config_get "$section" elimit)
- export ITARGET=$(config_get "$section" itarget)
- export ETARGET=$(config_get "$section" etarget)
- 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 QDISC=$(config_get "$section" qdisc)
- export SCRIPT=$(config_get "$section" script)
-
- # 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_INGRESS=$(config_get "$section" squash_dscp)
- export IGNORE_DSCP_INGRESS=$(config_get "$section" squash_ingress)
-
- # 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.
- export SQM_DEBUG=${SQM_DEBUG:-$(config_get "$section" debug_logging)}
- export SQM_VERBOSITY_MAX=${SQM_VERBOSITY_MAX:-$(config_get "$section" verbosity)}
- export SQM_VERBOSITY_MIN
-
- "${SQM_LIB_DIR}/start-sqm"
-}
-
-release_lock() {
- PID=$(cat "$LOCKDIR/pid")
- if [ "$PID" -ne "$$" ]; then
- sqm_error "Trying to release lock with wrong PID $PID != $$"
- return 1
- fi
-
- rm -rf "$LOCKDIR"
- return 0
-}
-
-take_lock() {
-
- if mkdir "$LOCKDIR" 2>/dev/null; then
- sqm_trace "Acquired run lock"
- echo $$ > "$LOCKDIR/pid"
-
- trap release_lock 0
- return 0
- fi
- PID=$(cat "$LOCKDIR/pid")
- sqm_warn "Unable to get run lock - already held by $PID"
- return 1
-}
-
-MAX_TRIES=10
-tries=$MAX_TRIES
-while ! take_lock; do
- sleep 1
- tries=$((tries - 1))
- if [ "$tries" -eq 0 ]; then
- sqm_error "Giving up on getting lock after $MAX_TRIES attempts"
- sqm_error "This is a bug; please report it at https://github.com/tohojo/sqm-scripts/issues"
- sqm_error "Then, to re-enable sqm-scripts, manually remove $LOCKDIR"
- exit 1
- fi
-done
-
-if [ "$ACTION" = "stop" ]; then
- if [ -z "$RUN_IFACE" ]; then
- # Stopping all active interfaces
- for f in ${SQM_STATE_DIR}/*.state; do
- stop_statefile "$f"
- done
- else
- stop_statefile "${SQM_STATE_DIR}/${RUN_IFACE}.state"
- fi
-else
- config_load sqm
- config_foreach start_sqm_section
-fi
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos
deleted file mode 100644
index 55f3cdf..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos
+++ /dev/null
@@ -1,234 +0,0 @@
-################################################################################
-# simple.qos (Cero3 Shaper)
-#
-# Abstract:
-# This is a three band fq_codel and ipv6 enabled shaping script for Ethernet
-# gateways. Compared to the complexity that debloat had become this cleanly
-# shows a means of going from diffserv marking to prioritization using the
-# current tools ip(6)tables and tc. We should note that the complexity of
-# debloat exists for a reason, and it is expected that script is run first to
-# setup various other parameters such as BQL and ethtool.
-#
-# (Assume the debloat script has setup the other interfaces.)
-#
-# Notes:
-# This does the right thing with ipv6 traffic. It also tries to leverage
-# diffserv to some sane extent. In particular, the 'priority' queue is limited
-# to 33% of the total, so EF, and IMM traffic cannot starve other types. The
-# rfc suggested 30%. 30% is probably a lot in today's world.
-#
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-#
-################################################################################
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-2016
-# Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-#
-################################################################################
-
-. ${SQM_LIB_DIR}/defaults.sh
-
-################################################################################
-
-ipt_setup() {
-
- ipt -t mangle -N QOS_MARK_${IFACE}
-
- case $QDISC in
- cake*)
- sqm_debug "cake does all the diffserv work - no need for iptables rules"
- ;;
- *)
- ipt -t mangle -A QOS_MARK_${IFACE} -j MARK --set-mark 0x2/${IPT_MASK}
- # You can go further with classification but...
- ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS1 -j MARK --set-mark 0x3/${IPT_MASK}
- ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class CS6 -j MARK --set-mark 0x1/${IPT_MASK}
- ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class EF -j MARK --set-mark 0x1/${IPT_MASK}
- ipt -t mangle -A QOS_MARK_${IFACE} -m dscp --dscp-class AF42 -j MARK --set-mark 0x1/${IPT_MASK}
- ipt -t mangle -A QOS_MARK_${IFACE} -m tos --tos Minimize-Delay -j MARK --set-mark 0x1/${IPT_MASK}
- ;;
- esac
-
- # Turn it on. Preserve classification if already performed
- #
- #sm: is it correct to do this in $IFACE? Should ingress not be on $DEV? since HTB acts on $DEV?
- #
- # ZERO also does not work on $DEV (that is the IFB will still see the
- # incoming ToS bits whether we squash or not)
- #
- # ZERO is still useful to protect internal machines...
- 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
- sqm_debug "Keeping differentiated services code points (DSCP) from ingress."
- ipt -t mangle -A PREROUTING -i $IFACE -m mark --mark 0x00/${IPT_MASK} -g QOS_MARK_${IFACE}
- fi
-
- ipt -t mangle -A POSTROUTING -o $IFACE -m mark --mark 0x00/${IPT_MASK} -g QOS_MARK_${IFACE}
-
- # The Syn optimization was nice but fq_codel does it for us
- # ipt -t mangle -A PREROUTING -i s+ -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -j MARK --set-mark 0x01
- # Not sure if this will work. Encapsulation is a problem period
-
- ipt -t mangle -I PREROUTING -i vtun+ -p tcp -j MARK --set-mark 0x2/${IPT_MASK} # tcp tunnels need ordering
-
- # Emanating from router, do a little more optimization
- # but don't bother with it too much.
-
- ipt -t mangle -A OUTPUT -p udp -m multiport --ports 123,53 -j DSCP --set-dscp-class AF42
-
- #Not clear if the second line is needed
- #ipt -t mangle -A OUTPUT -o $IFACE -g QOS_MARK_${IFACE}
-
-}
-
-
-
-cake_egress()
-{
- $TC qdisc add dev $IFACE root `get_stab_string` $QDISC bandwidth ${CEIL}kbit `get_cake_lla_string` ${EQDISC_OPTS}
-}
-
-egress() {
-
- CEIL=${UPLINK}
- PRIO_RATE=`expr $CEIL / 3` # Ceiling for prioirty
- BE_RATE=`expr $CEIL / 6` # Min for best effort
- BK_RATE=`expr $CEIL / 6` # Min for background
- BE_CEIL=`expr $CEIL - 16` # A little slop at the top
-
- LQ="quantum `get_htb_quantum $IFACE $CEIL ${ESHAPER_QUANTUM_DUR_US}`"
- BURST="`get_htb_burst $IFACE $CEIL ${ESHAPER_BURST_DUR_US}`"
-
- SILENT=1 $TC qdisc del dev $IFACE root
-
- case $QDISC in
- cake*) cake_egress; return;;
- esac
-
- $TC qdisc add dev $IFACE root handle 1: `get_stab_string` htb default 12
- $TC class add dev $IFACE parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit $BURST `get_htb_adsll_string`
- $TC class add dev $IFACE parent 1:1 classid 1:11 htb $LQ rate 128kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
- $TC class add dev $IFACE parent 1:1 classid 1:12 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit $BURST 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 $BURST prio 3 `get_htb_adsll_string`
-
- $TC qdisc add dev $IFACE parent 1:11 handle 110: $QDISC \
- `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${PRIO_RATE}` ${EQDISC_OPTS}
- $TC qdisc add dev $IFACE parent 1:12 handle 120: $QDISC \
- `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BE_RATE}` ${EQDISC_OPTS}
- $TC qdisc add dev $IFACE parent 1:13 handle 130: $QDISC \
- `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${EQDISC_OPTS}
-
- # Need a catchall rule
-
- $TC filter add dev $IFACE parent 1:0 protocol all prio 999 u32 \
- match ip protocol 0 0x00 flowid 1:12
-
- # FIXME should probably change the filter here to do pre-nat
-
- $TC filter add dev $IFACE parent 1:0 protocol ip prio 1 handle 1/${IPT_MASK} fw classid 1:11
- $TC filter add dev $IFACE parent 1:0 protocol ip prio 2 handle 2/${IPT_MASK} fw classid 1:12
- $TC filter add dev $IFACE parent 1:0 protocol ip prio 3 handle 3/${IPT_MASK} fw classid 1:13
-
- # ipv6 support. Note that the handle indicates the fw mark bucket that is looked for
-
- $TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 4 handle 1/${IPT_MASK} fw classid 1:11
- $TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 5 handle 2/${IPT_MASK} fw classid 1:12
- $TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 6 handle 3/${IPT_MASK} fw classid 1:13
-
- # Arp traffic
-
- $TC filter add dev $IFACE parent 1:0 protocol arp prio 7 handle 1/${IPT_MASK} fw classid 1:11
-
- # ICMP traffic - Don't impress your friends. Deoptimize to manage ping floods
- # better instead
-
- $TC filter add dev $IFACE parent 1:0 protocol ip prio 8 \
- u32 match ip protocol 1 0xff flowid 1:13
-
- $TC filter add dev $IFACE parent 1:0 protocol ipv6 prio 9 \
- u32 match ip protocol 1 0xff flowid 1:13
-}
-
-
-cake_ingress()
-{
- CAKEARGS=
- [ "$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}
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to $DEV
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-}
-
-ingress() {
-
- CEIL=$DOWNLINK
- PRIO_RATE=`expr $CEIL / 3` # Ceiling for prioirty
- BE_RATE=`expr $CEIL / 6` # Min for best effort
- BK_RATE=`expr $CEIL / 6` # Min for background
- BE_CEIL=`expr $CEIL - 16` # A little slop at the top
-
- LQ="quantum `get_htb_quantum $IFACE $CEIL ${ISHAPER_QUANTUM_DUR_US}`"
- BURST="`get_htb_burst $IFACE $CEIL ${ISHAPER_BURST_DUR_US}`"
-
- SILENT=1 $TC qdisc del dev $IFACE handle ffff: ingress
- $TC qdisc add dev $IFACE handle ffff: ingress
-
- SILENT=1 $TC qdisc del dev $DEV root
-
- case $QDISC in
- cake*) cake_ingress; return ;;
- esac
-
- 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`
- $TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit $BURST prio 0 `get_htb_adsll_string`
- $TC qdisc add dev $DEV parent 1:10 handle 110: $QDISC \
- `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
- else
- sqm_debug "Perform DSCP based filtering on ingress. (3-tier classification)"
- $TC qdisc add dev $DEV root handle 1: `get_stab_string` htb default 12
- $TC class add dev $DEV parent 1: classid 1:1 htb $LQ rate ${CEIL}kbit ceil ${CEIL}kbit $BURST `get_htb_adsll_string`
- $TC class add dev $DEV parent 1:1 classid 1:11 htb $LQ rate 32kbit ceil ${PRIO_RATE}kbit prio 1 `get_htb_adsll_string`
- $TC class add dev $DEV parent 1:1 classid 1:12 htb $LQ rate ${BE_RATE}kbit ceil ${BE_CEIL}kbit $BURST prio 2 `get_htb_adsll_string`
- $TC class add dev $DEV parent 1:1 classid 1:13 htb $LQ rate ${BK_RATE}kbit ceil ${BE_CEIL}kbit $BURST prio 3 `get_htb_adsll_string`
-
- $TC qdisc add dev $DEV parent 1:11 handle 110: $QDISC \
- `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 500` `get_flows ${PRIO_RATE}` ${IQDISC_OPTS}
- $TC qdisc add dev $DEV parent 1:12 handle 120: $QDISC \
- `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 1500` `get_flows ${BE_RATE}` ${IQDISC_OPTS}
- $TC qdisc add dev $DEV parent 1:13 handle 130: $QDISC \
- `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_quantum 300` `get_flows ${BK_RATE}` ${IQDISC_OPTS}
-
- diffserv $DEV
- fi
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to $DEV
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-sqm_prepare_script() {
- do_modules
- verify_qdisc "htb" || return 1
- ipt_setup
-}
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos.help b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos.help
deleted file mode 100644
index b3c0096..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simple.qos.help
+++ /dev/null
@@ -1 +0,0 @@
-BW-limited three-tier prioritisation scheme with your qdisc on each queue. (default)
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos
deleted file mode 100644
index 80fe208..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos
+++ /dev/null
@@ -1,104 +0,0 @@
-################################################################################
-# simplest.qos (Cero3 Simple Shaper)
-#
-# Abstract:
-# This is a single band fq_codel and ipv6 enabled shaping script for Ethernet
-# gateways. This is nearly the simplest possible. With FQ_CODEL, the sparseness
-# priority will work pretty well for a casual network. Flow-hashes should not
-# overlap much with only a few users.
-#
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-#
-################################################################################
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-2016
-# Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-#
-################################################################################
-
-. ${SQM_LIB_DIR}/defaults.sh
-
-################################################################################
-
-cake_egress()
-{
- $TC qdisc add dev $IFACE root `get_stab_string` cake bandwidth ${UPLINK}kbit besteffort `get_cake_lla_string` ${EQDISC_OPTS}
-}
-
-egress() {
-
- LQ="quantum `get_htb_quantum $IFACE ${UPLINK} ${ESHAPER_QUANTUM_DUR_US}`"
- BURST="`get_htb_burst $IFACE ${UPLINK} ${ESHAPER_BURST_DUR_US}`"
-
- SILENT=1 $TC qdisc del dev $IFACE root
-
- case $QDISC in
- cake*) cake_egress; return ;;
- esac
-
- $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 $BURST `get_htb_adsll_string`
- $TC class add dev $IFACE parent 1:1 classid 1:10 htb $LQ rate ${UPLINK}kbit ceil ${UPLINK}kbit $BURST prio 0 `get_htb_adsll_string`
- $TC qdisc add dev $IFACE parent 1:10 handle 110: $QDISC \
- `get_limit ${ELIMIT}` `get_target "${ETARGET}" ${UPLINK}` `get_ecn ${EECN}` `get_flows ${UPLINK}` ${EQDISC_OPTS}
-
-}
-
-cake_ingress()
-{
- $TC qdisc add dev $DEV root `get_stab_string` cake bandwidth ${DOWNLINK}kbit besteffort `get_cake_lla_string` ${IQDISC_OPTS}
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to $DEV
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-}
-
-ingress() {
- sqm_debug "ingress"
- SILENT=1 $TC qdisc del dev $IFACE handle ffff: ingress
- $TC qdisc add dev $IFACE handle ffff: ingress
-
- LQ="quantum `get_htb_quantum $IFACE ${DOWNLINK} ${ISHAPER_QUANTUM_DUR_US}`"
- BURST="`get_htb_burst $IFACE ${DOWNLINK} ${ISHAPER_BURST_DUR_US}`"
-
- SILENT=1 $TC qdisc del dev $DEV root
-
- case $QDISC in
- cake*) cake_ingress; return ;;
- esac
-
- $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`
- $TC class add dev $DEV parent 1:1 classid 1:10 htb $LQ rate ${DOWNLINK}kbit ceil ${DOWNLINK}kbit $BURST prio 0 `get_htb_adsll_string`
-
- # FIXME: I'd prefer to use a pre-nat filter but we need to detect if nat is on this interface
- # AND we need to permute by a random number which we can't do from userspace filters
-
- # 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 \
- `get_limit ${ILIMIT}` `get_target "${ITARGET}" ${DOWNLINK}` `get_ecn ${IECN}` `get_flows ${DOWNLINK}` ${IQDISC_OPTS}
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to ifb0
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-sqm_prepare_script() {
- do_modules
- verify_qdisc "htb" || return 1
-}
-
-################################################################################
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos.help b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos.help
deleted file mode 100644
index c359256..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest.qos.help
+++ /dev/null
@@ -1 +0,0 @@
-Simplest possible configuration: HTB rate limiter with your qdisc attached.
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos
deleted file mode 100644
index 3f7a1c3..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos
+++ /dev/null
@@ -1,85 +0,0 @@
-################################################################################
-# simplest_tbf.qos (Simple TBF shaper)
-#
-# Abstract:
-# This is a single band fq_codel and ipv6 enabled shaping script for Ethernet
-# gateways. This is nearly the simplest possible. With FQ_CODEL, the sparseness
-# priority will work pretty well for a casual network. Flow-hashes should not
-# overlap much with only a few users.
-#
-# Uses TBF instead of HTB as that may give better performance on some
-# architectures.
-#
-# References:
-# This alternate shaper attempts to go for 1/u performance in a clever way
-# http://git.coverfire.com/?p=linux-qos-scripts.git;a=blob;f=src-3tos.sh;hb=HEAD
-#
-################################################################################
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-2017
-# Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-#
-################################################################################
-
-. ${SQM_LIB_DIR}/defaults.sh
-
-################################################################################
-
-egress() {
-
- MTU=$(get_mtu $IFACE)
- BURST="$(get_burst ${MTU:-1514} ${UPLINK} ${ESHAPER_BURST_DUR_US})"
- BURST=${BURST:-1514}
-
- SILENT=1 $TC qdisc del dev $IFACE root
-
- $TC qdisc add dev $IFACE root handle 1: $(get_stab_string) tbf \
- rate ${UPLINK}kbit burst $BURST latency 300ms $(get_htb_adsll_string)
- $TC qdisc add dev $IFACE parent 1: handle 110: $QDISC \
- $(get_limit ${ELIMIT}) $(get_target "${ETARGET}" ${UPLINK}) \
- $(get_ecn ${EECN}) $(get_flows ${UPLINK}) ${EQDISC_OPTS}
-
-}
-
-ingress() {
- sqm_debug "ingress"
- SILENT=1 $TC qdisc del dev $IFACE handle ffff: ingress
- $TC qdisc add dev $IFACE handle ffff: ingress
-
- MTU=$(get_mtu $IFACE)
- BURST="$(get_burst ${MTU:-1514} ${DOWNLINK} ${ISHAPER_BURST_DUR_US})"
- BURST=${BURST:-1514}
-
- SILENT=1 $TC qdisc del dev $DEV root
-
- $TC qdisc add dev $DEV root handle 1: $(get_stab_string) tbf \
- rate ${DOWNLINK}kbit burst $BURST latency 300ms $(get_htb_adsll_string)
- $TC qdisc add dev $DEV parent 1: handle 110: $QDISC \
- $(get_limit ${ILIMIT}) $(get_target "${ITARGET}" ${DOWNLINK}) \
- $(get_ecn ${IECN}) $(get_flows ${DOWNLINK}) ${IQDISC_OPTS}
-
- $IP link set dev $DEV up
-
- # redirect all IP packets arriving in $IFACE to ifb0
-
- $TC filter add dev $IFACE parent ffff: protocol all prio 10 u32 \
- match u32 0 0 flowid 1:1 action mirred egress redirect dev $DEV
-
-}
-
-sqm_prepare_script() {
- do_modules
- verify_qdisc "tbf" || return 1
-
- case $QDISC in
- cake*)
- sqm_warn "Cake is not supported with this script; falling back to FQ-CoDel"
- QDISC=fq_codel ;;
- esac
-}
-
-################################################################################
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos.help b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos.help
deleted file mode 100644
index 3f93f89..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/simplest_tbf.qos.help
+++ /dev/null
@@ -1,2 +0,0 @@
-Simplest possible configuration (TBF): TBF rate limiter with your qdisc attached.
-TBF may give better performance than HTB on some architectures.
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/start-sqm b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/start-sqm
deleted file mode 100644
index cd76e01..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/start-sqm
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-
-[ -n "$IFACE" ] || exit 1
-
-. /etc/sqm/sqm.conf
-. ${SQM_LIB_DIR}/functions.sh
-. ${SQM_LIB_DIR}/defaults.sh
-STATE_FILE="${SQM_STATE_DIR}/${IFACE}.state"
-
-check_state_dir
-
-# log file for the most recent sqm instance start
-if [ "$SQM_DEBUG" -eq "1" ] ; then
- SQM_DEBUG_LOG="${SQM_START_LOG}"
- OUTPUT_TARGET="${SQM_DEBUG_LOG}"
- echo "start-sqm: Log for interface ${IFACE}: $(date)" > "${OUTPUT_TARGET}"
-fi
-
-if [ -z "${SCRIPT}" ] ; then
- sqm_error "SCRIPT value is not defined in /etc/sqm/${IFACE}.iface.conf"
- sqm_error "Please check your configuration and try again."
- exit 1
-fi
-
-if [ -f "${STATE_FILE}" ]; then
- sqm_error "SQM already activated on ${IFACE}."
- exit 1
-fi
-
-# in case of spurious hotplug events, try double check whether the interface is really up
-if [ ! -d /sys/class/net/${IFACE} ] ; then
- sqm_error "${IFACE} does currently not exist, not even trying to start SQM on nothing."
- exit 1
-fi
-
-if [ "${ENABLED:-1}" -ne "1" ]; then
- sqm_log "SQM config disabled on ${IFACE}."
- exit 0
-fi
-
-if [ ! -f "${SQM_LIB_DIR}/$SCRIPT" ]; then
- sqm_error "SQM script ${SCRIPT} not found!"
- exit 1
-fi
-
-. "${SQM_LIB_DIR}/$SCRIPT"
-
-sqm_trace; sqm_trace "$(date): Starting." # Add some space and a date stamp to verbose log output and log files to separate runs
-sqm_log "Starting SQM script: ${SCRIPT} on ${IFACE}, in: ${DOWNLINK} Kbps, out: ${UPLINK} Kbps"
-
-if fn_exists sqm_start ; then
- sqm_debug "Using script specific sqm_start function overriding the generic sqm_start_default."
- sqm_start && write_state_file ${STATE_FILE} && sqm_log "${SCRIPT} was started on ${IFACE} successfully"
-else
- sqm_debug "Using generic sqm_start_default function."
- sqm_start_default && write_state_file ${STATE_FILE} && sqm_log "${SCRIPT} was started on ${IFACE} successfully"
-fi
-
-exit 0
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/stop-sqm b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/stop-sqm
deleted file mode 100644
index 9a9cbeb..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/stop-sqm
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# Copyright (C) 2012-4 Michael D. Taht, Toke Høiland-Jørgensen, Sebastian Moeller
-
-# allow passing in the IFACE as first command line argument
-
-[ -n "$IFACE" ] || exit 1
-
-. /etc/sqm/sqm.conf
-. ${SQM_LIB_DIR}/functions.sh
-. ${SQM_LIB_DIR}/defaults.sh
-
-check_state_dir
-# log file for the most recent sqm instance stop
-if [ "$SQM_DEBUG" -eq "1" ] ; then
- SQM_DEBUG_LOG="${SQM_STOP_LOG}"
- OUTPUT_TARGET="${SQM_DEBUG_LOG}"
- echo "stop-sqm: Log for interface ${IFACE}: $(date)" > "${OUTPUT_TARGET}"
-fi
-
-if [ ! -f "${SQM_STATE_DIR}/${IFACE}.state" ] ; then
- sqm_error "State file does not exist; SQM was not running on interface ${IFACE}"
- exit 1
-fi
-STATE_FILE="${SQM_STATE_DIR}/${IFACE}.state"
-
-if [ -z "${SCRIPT}" ] ; then
- sqm_error "SCRIPT value is not defined in /etc/sqm/${IFACE}.iface.conf"
- sqm_error "Please check your configuration and try again."
- exit 1
-fi
-
-sqm_trace; sqm_trace "$(date): Stopping." # Add some space and a date stamp to verbose log output and log files to separate runs
-sqm_log "Stopping SQM on ${IFACE}"
-
-# make sure to only delete the ifb associated with the current interface
-CUR_IFB=$( get_ifb_associated_with_if ${IFACE} )
-[ -z "$CUR_IFB" ] && CUR_IFB=$( ifb_name ${IFACE} )
-
-if [ ! -f "${SQM_LIB_DIR}/$SCRIPT" ]; then
- sqm_error "SQM script ${SCRIPT} not found!"
- exit 1
-fi
-
-. "${SQM_LIB_DIR}/$SCRIPT"
-
-sqm_stop
-rm -f "${STATE_FILE}"
-
-exit 0
diff --git a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/update-available-qdiscs b/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/update-available-qdiscs
deleted file mode 100644
index c966a19..0000000
--- a/rooter/0optionalapps/ext-throttle/files/usr/lib/sqm/update-available-qdiscs
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. /etc/sqm/sqm.conf
-. ${SQM_LIB_DIR}/functions.sh
-. ${SQM_LIB_DIR}/defaults.sh
-
-[ -d "${SQM_QDISC_STATE_DIR}" ] || mkdir -p "${SQM_QDISC_STATE_DIR}"
-
-SQM_VERBOSITY_MIN=5 # Silence errors while checking
-
-for qdisc in $SQM_CHECK_QDISCS; do
- [ -f ${SQM_QDISC_STATE_DIR}/$qdisc ] && continue
- verify_qdisc $qdisc && touch ${SQM_QDISC_STATE_DIR}/$qdisc
-done
diff --git a/rooter/0optionalapps/ext-wireguard/files/etc/init.d/wireguard b/rooter/0optionalapps/ext-wireguard/files/etc/init.d/wireguard
index 4e49b81..16a34ce 100644
--- a/rooter/0optionalapps/ext-wireguard/files/etc/init.d/wireguard
+++ b/rooter/0optionalapps/ext-wireguard/files/etc/init.d/wireguard
@@ -84,4 +84,9 @@ start() {
config_load wireguard
config_foreach chk_start wireguard
+ if [ -e /etc/crontabs/root ]; then
+ sed -i '/wireguard_watchdog/d' /etc/crontabs/root
+ fi
+ echo '* * * * * /usr/bin/wireguard_watchdog' >> /etc/crontabs/root
+ /etc/init.d/cron restart
}
\ No newline at end of file
diff --git a/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/model/cbi/wireguard-client.lua b/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/model/cbi/wireguard-client.lua
index ec041aa..45e2216 100644
--- a/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/model/cbi/wireguard-client.lua
+++ b/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/model/cbi/wireguard-client.lua
@@ -59,6 +59,11 @@ pkey = s:option(Value, "privatekey", translate("Private Key :"), translate("Priv
pkey.rmempty = true;
pkey.optional=false;
+il = s:option(ListValue, "wginter", translate("Interface to Use :"));
+il:value("0", translate("WG0"))
+il:value("1", translate("WG1"))
+il.default="0"
+
bl = s:option(ListValue, "auto", translate("Start on Boot :"));
bl:value("0", translate("No"))
bl:value("1", translate("Yes"))
diff --git a/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/view/wireguard/wireguard.htm b/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/view/wireguard/wireguard.htm
index d207f05..cf7544e 100644
--- a/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/view/wireguard/wireguard.htm
+++ b/rooter/0optionalapps/ext-wireguard/files/usr/lib/lua/luci/view/wireguard/wireguard.htm
@@ -40,10 +40,14 @@
XHR.poll(5, '<%=luci.dispatcher.build_url("admin", "vpn", "wirestatus")%>', null,
function(x, data) {
+ both = {};
+ bothbp={};
+ iii = 1;
for (var key in data) {
if (!data.hasOwnProperty(key)) { continue; }
var ifname = key;
var iface = data[key];
+
var s = "";
if (iface.public_key == '(none)') {
s += '
<%:Interface does not have a public key!%>';
@@ -65,7 +69,16 @@
iface.fwmark
);
}
- document.getElementById("iinfo").innerHTML = s;
+ if ( iii == 1 )
+ {
+ document.getElementById("iinfo").innerHTML = s;
+ document.getElementById("leg").innerHTML = ifname;
+ }
+ else
+ {
+ document.getElementById("iinfo1").innerHTML = s;
+ document.getElementById("leg1").innerHTML = ifname;
+ }
for (var i = 0, ilen = iface.peers.length; i < ilen; i++) {
var peer = iface.peers[i];
var s = String.format(
@@ -105,9 +118,18 @@
bytes_to_str(peer.transfer_rx),
bytes_to_str(peer.transfer_tx)
);
- document.getElementById("config").innerHTML = icon;
- document.getElementById("info").innerHTML = s;
+ if ( iii == 1 )
+ {
+ document.getElementById("config").innerHTML = icon;
+ document.getElementById("info").innerHTML = s;
+ }
+ else
+ {
+ document.getElementById("config1").innerHTML = icon;
+ document.getElementById("info1").innerHTML = s;
+ }
}
+ iii = iii + 1;
}
});
//]]>
@@ -116,9 +138,16 @@