Changeset 21832


Ignore:
Timestamp:
2010-06-18T06:15:30+02:00 (7 years ago)
Author:
craigc
Message:

[packages] multiwan: Updated QoS table names.

Location:
packages/net/multiwan
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/net/multiwan/Makefile

    r21831 r21832  
    1010PKG_NAME:=multiwan 
    1111PKG_VERSION:=1.0.13 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414include $(INCLUDE_DIR)/package.mk 
  • packages/net/multiwan/files/usr/bin/multiwan

    r21831 r21832  
    335335i=`expr $i + 1`  
    336336group=$(query_config group $i) 
    337 iptables -t mangle -F ${group} 
    338 iptables -t mangle -F ${group}_ct 
    339 iptables -t mangle -X ${group} 
    340 iptables -t mangle -X ${group}_ct 
     337iptables -t mangle -F qos_${group} 
     338iptables -t mangle -F qos_${group}_ct 
     339iptables -t mangle -X qos_${group} 
     340iptables -t mangle -X qos_${group}_ct 
    341341done 
    342342 
     
    380380queue_count=`expr $queue_count + 1` 
    381381 
    382 iptables -t mangle -N ${1} 
    383 iptables -t mangle -N ${1}_ct 
     382iptables -t mangle -N qos_${1} 
     383iptables -t mangle -N qos_${1}_ct 
    384384 
    385385get_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")  
    386 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") 
     386get_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") 
    387387 
    388388 
     
    413413  ip rule add fwmark 0x$(expr $p + 1 - 300) table $(expr $iprule + 300) prio $(expr $p + 2) 
    414414fi 
    415   iptables -t mangle -A MultiWanQoS -m mark --mark 0x$(expr $p - 300) -j ${1} 
     415  iptables -t mangle -A MultiWanQoS -m mark --mark 0x$(expr $p - 300) -j qos_${1} 
    416416  i=`expr $i + 1` 
    417417done 
Note: See TracChangeset for help on using the changeset viewer.