qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:15:00 +02:00
Code

[backfire] merge r23227 and r23238

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23297 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-07 15:18:00 +00:00
parent 28caf5dec8
commit 03a9ab5e49
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/qos-scripts/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2008 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=qos-scripts PKG_NAME:=qos-scripts
PKG_VERSION:=1.2.1 PKG_VERSION:=1.2.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@ -29,6 +29,10 @@ define Package/qos-scripts/description
entries. entries.
endef endef
define Package/qos-scripts/conffiles
/etc/config/qos
endef
define Build/Prepare define Build/Prepare
endef endef

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

@ -380,7 +380,6 @@ start_cg() {
local iptrules local iptrules
local pktrules local pktrules
local sizerules local sizerules
local download
enum_classes "$cg" enum_classes "$cg"
add_rules iptrules "$ctrules" "iptables -t mangle -A ${cg}_ct" add_rules iptrules "$ctrules" "iptables -t mangle -A ${cg}_ct"
config_get classes "$cg" classes config_get classes "$cg" classes
@ -397,12 +396,14 @@ start_cg() {
config_get classgroup "$iface" classgroup config_get classgroup "$iface" classgroup
config_get device "$iface" device config_get device "$iface" device
config_get imqdev "$iface" imqdev config_get imqdev "$iface" imqdev
config_get dl "$iface" download config_get upload "$iface" upload
config_get download "$iface" download
config_get halfduplex "$iface" halfduplex config_get halfduplex "$iface" halfduplex
download="${download:-${halfduplex:+$upload}}"
add_insmod ipt_IMQ add_insmod ipt_IMQ
append up "iptables -t mangle -A OUTPUT -o $device -j ${cg}" "$N" append up "iptables -t mangle -A OUTPUT -o $device -j ${cg}" "$N"
append up "iptables -t mangle -A FORWARD -o $device -j ${cg}" "$N" append up "iptables -t mangle -A FORWARD -o $device -j ${cg}" "$N"
[ -z "$dl" ] || { [ -z "$download" ] || {
append down "iptables -t mangle -A POSTROUTING -o $device -j ${cg}" "$N" append down "iptables -t mangle -A POSTROUTING -o $device -j ${cg}" "$N"
[ -z "$halfduplex" ] || { [ -z "$halfduplex" ] || {
append down "iptables -t mangle -A POSTROUTING -o $device -j IMQ --todev $imqdev" "$N" append down "iptables -t mangle -A POSTROUTING -o $device -j IMQ --todev $imqdev" "$N"