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

[packages] multiwan: Updated probabilities matrix, added rounding.

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@21431 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
craigc 2010-05-12 20:54:57 +00:00
parent a585129a0e
commit cab1cc25b1
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/multiwan/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=multiwan PKG_NAME:=multiwan
PKG_VERSION:=1.0.8 PKG_VERSION:=1.0.11
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

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

@ -639,9 +639,11 @@ local rand_probability
local last_probability local last_probability
local total_weight local total_weight
local total_wans local total_wans
local roundme
local roundlen
local i local i
local x local x
local y local n
echo "## Refreshing Load Balancer ##" echo "## Refreshing Load Balancer ##"
@ -660,13 +662,10 @@ ip route flush table 123 > /dev/null 2>&1
done done
done done
iptables -F MultiWanLoadBalancer -t mangle
total_weight=0 total_weight=0
total_wans=0 total_wans=0
last_probability=0
x=0
y=0
iptables -F MultiWanLoadBalancer -t mangle
i=0 i=0
while [ $i -lt $wancount ]; do while [ $i -lt $wancount ]; do
@ -682,6 +681,12 @@ weight=`uci -q -P /var/state get multiwan.${group}.weight`
fi fi
done done
last_probability=0
roundme=0
roundlen=0
x=0
n=0
i=0 i=0
while [ $i -lt $wancount ]; do while [ $i -lt $wancount ]; do
i=`expr $i + 1` i=`expr $i + 1`
@ -694,14 +699,24 @@ weight=`uci -q -P /var/state get multiwan.${group}.weight`
if [ "$gateway" != "x" -a "$ifname" != "x" -a "$failchk" != "x" -a "$weight" != "disable" ]; then if [ "$gateway" != "x" -a "$ifname" != "x" -a "$failchk" != "x" -a "$weight" != "disable" ]; then
nexthop="$nexthop nexthop via $gateway dev $ifname weight $weight" nexthop="$nexthop nexthop via $gateway dev $ifname weight $weight"
y=$last_probability
last_probability=$(expr $x / $(expr $wancount - $i + 1)) n=$(expr $n + $last_probability)
rand_probability=$(expr $(expr $(expr $weight \* 100) / $total_weight) + $last_probability + $y) last_probability=$(expr $x / $(expr $total_wans - $i + 1))
rand_probability=$(expr $(expr $weight \* 1000) / $total_weight)
roundlen=`expr length $rand_probability - 1`
roundme=${rand_probability:$roundlen}
rand_probability=$(echo $rand_probability | sed s/$roundme//)
if [ $roundme -ge 5 ]; then
rand_probability=$(expr $rand_probability + 1)
fi
rand_probability=$(expr $rand_probability + $n + $last_probability)
x=$rand_probability x=$rand_probability
if [ $rand_probability -lt 10 ]; then if [ $rand_probability -lt 10 ]; then
rand_probability="0.0${rand_probability}" rand_probability="0.0${rand_probability}"
elif [ $rand_probability -lt 100 -a $i != $total_wans ]; then elif [ $rand_probability -lt 100 ]; then
rand_probability="0.${rand_probability}" rand_probability="0.${rand_probability}"
else else
rand_probability="1.0" rand_probability="1.0"