qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 14:01:05 +02:00
Code

qos-scripts update - fix enabling/disabling of interfaces, make the overhead calculation optional

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7048 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-04-24 19:24:08 +00:00
parent 25a8ad6277
commit 814b429c34
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/qos-scripts/Makefile
View File

@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=qos-scripts PKG_NAME:=qos-scripts
PKG_VERSION:=1.1.0 PKG_VERSION:=1.1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

1
package/qos-scripts/files/etc/config/qos
View File

@ -4,6 +4,7 @@
config interface wan config interface wan
option classgroup "Default" option classgroup "Default"
option enabled 1 option enabled 1
option overhead 1
option upload 128 option upload 128
option download 1024 option download 1024

31
package/qos-scripts/files/usr/lib/qos/generate.sh
View File

@ -14,6 +14,7 @@ add_insmod() {
# only try to parse network config on openwrt # only try to parse network config on openwrt
find_ifname() {( find_ifname() {(
reset_cb
include /lib/network include /lib/network
scan_interfaces scan_interfaces
config_get "$1" ifname config_get "$1" ifname
@ -162,18 +163,18 @@ config_cb() {
config_get TYPE "$CONFIG_SECTION" TYPE config_get TYPE "$CONFIG_SECTION" TYPE
case "$TYPE" in case "$TYPE" in
interface) interface)
config_get enabled "$CONFIG_SECTION" enabled config_get_bool enabled "$CONFIG_SECTION" enabled 1
config_get download "$CONFIG_SECTION" download [ 1 -eq "$enabled" ] || return 0
config_get classgroup "$CONFIG_SECTION" classgroup config_get classgroup "$CONFIG_SECTION" classgroup
config_set "$CONFIG_SECTION" imqdev "$C" config_set "$CONFIG_SECTION" imqdev "$C"
[ -z "$enabled" -o "$(($enabled))" -eq 0 ] || { C=$(($C+1))
C=$(($C+1)) append INTERFACES "$CONFIG_SECTION"
INTERFACES="$INTERFACES $CONFIG_SECTION" config_set "$classgroup" enabled 1
config_set "$classgroup" enabled 1
}
config_get device "$CONFIG_SECTION" device config_get device "$CONFIG_SECTION" device
[ -z "$device" ] && device="$(find_ifname ${CONFIG_SECTION})" [ -z "$device" ] && {
config_set "$CONFIG_SECTION" device "${device:-eth0}" device="$(find_ifname ${CONFIG_SECTION})"
config_set "$CONFIG_SECTION" device "${device:-eth0}"
}
;; ;;
classgroup) append CG "$CONFIG_SECTION";; classgroup) append CG "$CONFIG_SECTION";;
classify|default|reclassify) classify|default|reclassify)
@ -231,19 +232,23 @@ start_interface() {
local iface="$1" local iface="$1"
local num_imq="$2" local num_imq="$2"
config_get device "$iface" device config_get device "$iface" device
config_get enabled "$iface" enabled config_get_bool enabled "$iface" enabled 1
[ -z "$device" -o -z "$enabled" ] && exit [ -z "$device" -o 1 -ne "$enabled" ] && {
echo "Interface '$iface' not found or disabled."
return 1
}
config_get upload "$iface" upload config_get upload "$iface" upload
config_get halfduplex "$iface" halfduplex config_get halfduplex "$iface" halfduplex
config_get download "$iface" download config_get download "$iface" download
config_get classgroup "$iface" classgroup config_get classgroup "$iface" classgroup
config_get_bool overhead "$iface" overhead 0
download="${download:-${halfduplex:+$upload}}" download="${download:-${halfduplex:+$upload}}"
enum_classes "$classgroup" enum_classes "$classgroup"
for dir in up${halfduplex} ${download:+down}; do for dir in up${halfduplex} ${download:+down}; do
case "$dir" in case "$dir" in
up) up)
upload=$(($upload * 98 / 100 - (32 * 128 / $upload))) [ "$overhead" = 1 ] && upload=$(($upload * 98 / 100 - (32 * 128 / $upload)))
dev="$device" dev="$device"
rate="$upload" rate="$upload"
dl_mode="" dl_mode=""
@ -252,7 +257,7 @@ start_interface() {
down) down)
add_insmod imq numdevs="$num_imq" add_insmod imq numdevs="$num_imq"
config_get imqdev "$iface" imqdev config_get imqdev "$iface" imqdev
download=$(($download * 98 / 100 - (100 * 1024 / $download))) [ "$overhead" = 1 ] && download=$(($download * 98 / 100 - (80 * 1024 / $download)))
dev="imq$imqdev" dev="imq$imqdev"
rate="$download" rate="$download"
dl_mode=1 dl_mode=1