bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] multiwan: Updated QoS table names.

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@21832 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
craigc
2010-06-18 04:15:30 +00:00
parent 49845f6838
commit 7f47e77375
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/multiwan/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=multiwan PKG_NAME:=multiwan
PKG_VERSION:=1.0.13 PKG_VERSION:=1.0.13
PKG_RELEASE:=1 PKG_RELEASE:=2
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

16
net/multiwan/files/usr/bin/multiwan
View File

@ -334,10 +334,10 @@ i=0
while [ $i -lt $wancount ]; do while [ $i -lt $wancount ]; do
i=`expr $i + 1` i=`expr $i + 1`
group=$(query_config group $i) group=$(query_config group $i)
iptables -t mangle -F ${group} iptables -t mangle -F qos_${group}
iptables -t mangle -F ${group}_ct iptables -t mangle -F qos_${group}_ct
iptables -t mangle -X ${group} iptables -t mangle -X qos_${group}
iptables -t mangle -X ${group}_ct iptables -t mangle -X qos_${group}_ct
done done
fi fi
@ -379,11 +379,11 @@ fi
queue_count=`expr $queue_count + 1` queue_count=`expr $queue_count + 1`
iptables -t mangle -N ${1} iptables -t mangle -N qos_${1}
iptables -t mangle -N ${1}_ct iptables -t mangle -N qos_${1}_ct
get_wan_tc=$(tc filter list dev $ifname | grep "0x" | sed -e "s/filter /tc filter add dev $ifname /g" -e "s/pref/prio/g" -e "s/fw//g") get_wan_tc=$(tc filter list dev $ifname | grep "0x" | sed -e "s/filter /tc filter add dev $ifname /g" -e "s/pref/prio/g" -e "s/fw//g")
get_wan_iptables=$(iptables-save | egrep '(-A Default )|(-A Default_ct )' | grep -v "MultiWanQoS" | sed -e "s/Default /${1} /g" -e "s/Default_ct /${1}_ct /g" -e "s/-A/iptables -t mangle -A/g") get_wan_iptables=$(iptables-save | egrep '(-A Default )|(-A Default_ct )' | grep -v "MultiWanQoS" | sed -e "s/Default /qos_${1} /g" -e "s/Default_ct /qos_${1}_ct /g" -e "s/-A/iptables -t mangle -A/g")
i=0 i=0
@ -412,7 +412,7 @@ while [ $i -lt $queue_count ]; do
if [ $i -lt $(expr $queue_count - 1) ]; then if [ $i -lt $(expr $queue_count - 1) ]; then
ip rule add fwmark 0x$(expr $p + 1 - 300) table $(expr $iprule + 300) prio $(expr $p + 2) ip rule add fwmark 0x$(expr $p + 1 - 300) table $(expr $iprule + 300) prio $(expr $p + 2)
fi fi
iptables -t mangle -A MultiWanQoS -m mark --mark 0x$(expr $p - 300) -j ${1} iptables -t mangle -A MultiWanQoS -m mark --mark 0x$(expr $p - 300) -j qos_${1}
i=`expr $i + 1` i=`expr $i + 1`
done done
} }