Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4792 from TDT-GmbH/mwan3-fixes

Browse source 
ne/mwan3: feature and fixes
This commit is contained in:
Hannu Nyman 2017-09-02 13:56:52 +03:00 committed by GitHub
commit 2c80296a6c
3 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/mwan3/Makefile
View file

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.6.3 PKG_VERSION:=2.6.4
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de> PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

4
net/mwan3/files/etc/hotplug.d/iface/14-mwan3
View file

@ -22,7 +22,7 @@ config_get local_source globals local_source 'none'
} }
mwan3_lock mwan3_lock
src_ip=$(uci -q -P /var/state get mwan3.globals.src_ip 2>/dev/null) src_ip=$(uci_get_state mwan3 globals src_ip)
[ "${src_ip}" != "" ] && { [ "${src_ip}" != "" ] && {
ip route del default via "${src_ip}" dev lo 1>/dev/null 2>&1 ip route del default via "${src_ip}" dev lo 1>/dev/null 2>&1
ip addr del "${src_ip}/32" dev lo 1>/dev/null 2>&1 ip addr del "${src_ip}/32" dev lo 1>/dev/null 2>&1
@ -37,7 +37,7 @@ usleep 10000
else else
ip addr add "${src_ip}/32" dev lo ip addr add "${src_ip}/32" dev lo
ip route add default via "${src_ip}" dev lo ip route add default via "${src_ip}" dev lo
uci -q -P /var/state set mwan3.globals.src_ip="${src_ip}" uci_toggle_state mwan3 globals src_ip "${src_ip}"
fi fi
} }
mwan3_unlock mwan3_unlock

8
net/mwan3/files/usr/sbin/mwan3track
View file

@ -81,8 +81,8 @@ main() {
local sleep_time=0 local sleep_time=0
local turn=0 local turn=0
if [ "$STATUS" = "offline" ]; then if [ "$STATUS" = "unknown" ]; then
echo "offline" > /var/run/mwan3track/$1/STATUS echo "unknown" > /var/run/mwan3track/$1/STATUS
score=0 score=0
else else
echo "online" > /var/run/mwan3track/$1/STATUS echo "online" > /var/run/mwan3track/$1/STATUS
@ -92,6 +92,7 @@ main() {
sleep_time=$interval sleep_time=$interval
for track_ip in $track_ips; do for track_ip in $track_ips; do
if [ $host_up_count -lt $reliability ]; then
case "$track_method" in case "$track_method" in
ping) ping)
ping -I $DEVICE -c $count -W $timeout -s $size -q $track_ip &> /dev/null ;; ping -I $DEVICE -c $count -W $timeout -s $size -q $track_ip &> /dev/null ;;
@ -107,6 +108,9 @@ main() {
let lost++ let lost++
echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip} echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
fi fi
else
echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
fi
done done
if [ $host_up_count -lt $reliability ]; then if [ $host_up_count -lt $reliability ]; then