From 50735bc351525f8df0fecabbe7f4a9410003d75d Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 24 Apr 2007 19:24:08 +0000
Subject: qos-scripts update - fix enabling/disabling of interfaces, make the
overhead calculation optional
SVN-Revision: 7048
---
package/qos-scripts/files/usr/lib/qos/generate.sh | 31 +++++++++++++----------
1 file changed, 18 insertions(+), 13 deletions(-)
(limited to 'package/qos-scripts/files/usr/lib/qos')
diff --git a/package/qos-scripts/files/usr/lib/qos/generate.sh b/package/qos-scripts/files/usr/lib/qos/generate.sh
index aceba57..a3c9f17 100755
--- a/package/qos-scripts/files/usr/lib/qos/generate.sh
+++ b/package/qos-scripts/files/usr/lib/qos/generate.sh
@@ -14,6 +14,7 @@ add_insmod() {
# only try to parse network config on openwrt
find_ifname() {(
+ reset_cb
include /lib/network
scan_interfaces
config_get "$1" ifname
@@ -162,18 +163,18 @@ config_cb() {
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_set "$CONFIG_SECTION" imqdev "$C"
- [ -z "$enabled" -o "$(($enabled))" -eq 0 ] || {
- C=$(($C+1))
- INTERFACES="$INTERFACES $CONFIG_SECTION"
- config_set "$classgroup" enabled 1
- }
+ C=$(($C+1))
+ append INTERFACES "$CONFIG_SECTION"
+ config_set "$classgroup" enabled 1
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)
@@ -231,19 +232,23 @@ start_interface() {
local iface="$1"
local num_imq="$2"
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" ] && {
+ echo "Interface '$iface' not found or disabled."
+ return 1
+ }
config_get upload "$iface" upload
config_get halfduplex "$iface" halfduplex
config_get download "$iface" download
config_get classgroup "$iface" classgroup
+ config_get_bool overhead "$iface" overhead 0
download="${download:-${halfduplex:+$upload}}"
enum_classes "$classgroup"
for dir in up${halfduplex} ${download:+down}; do
case "$dir" in
up)
- upload=$(($upload * 98 / 100 - (32 * 128 / $upload)))
+ [ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (32 * 128 / $upload)))
dev="$device"
rate="$upload"
dl_mode=""
@@ -252,7 +257,7 @@ start_interface() {
down)
add_insmod imq numdevs="$num_imq"
config_get imqdev "$iface" imqdev
- download=$(($download * 98 / 100 - (100 * 1024 / $download)))
+ [ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
dev="imq$imqdev"
rate="$download"
dl_mode=1
--
cgit v1.1