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

Merge pull request #8471 from ptpt52/mwan3-fix-rtmon-bug

Browse source 
mwan3: fix logical/typo bug in mwan3rtmon
This commit is contained in:
Hannu Nyman 2019-03-22 17:22:12 +02:00 committed by GitHub
commit ec23439800
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/mwan3/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=mwan3 PKG_NAME:=mwan3
PKG_VERSION:=2.7.11 PKG_VERSION:=2.7.12
PKG_RELEASE:=1 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/lib/mwan3/mwan3.sh
View file

@ -32,6 +32,8 @@ MM_BLACKHOLE=""
MMX_UNREACHABLE="" MMX_UNREACHABLE=""
MM_UNREACHABLE="" MM_UNREACHABLE=""
# return true(=0) if has any mwan3 interface enabled
# otherwise return false
mwan3_rtmon_ipv4() mwan3_rtmon_ipv4()
{ {
local tid=1 local tid=1
@ -61,6 +63,8 @@ mwan3_rtmon_ipv4()
return $ret return $ret
} }
# return true(=0) if has any mwan3 interface enabled
# otherwise return false
mwan3_rtmon_ipv6() mwan3_rtmon_ipv6()
{ {
local tid=1 local tid=1

6
net/mwan3/files/usr/sbin/mwan3rtmon
View file

@ -25,14 +25,14 @@ main() {
sleep 3 sleep 3
while true; do while true; do
mwan3_lock "service" "mwan3rtmon" mwan3_lock "service" "mwan3rtmon"
[ mwan3_remon_ipv4 = "1" ] || \ mwan3_rtmon_ipv4 || mwan3_rtmon_ipv6
[ mwan3_rtmon_ipv6 = "1" ] && break ret=$?
mwan3_unlock "service" "mwan3rtmon" mwan3_unlock "service" "mwan3rtmon"
[ "$ret" = "0" ] || break
[ "$rtmon_interval" = "0" ] && break [ "$rtmon_interval" = "0" ] && break
sleep "$rtmon_interval" & sleep "$rtmon_interval" &
wait wait
done done
mwan3_unlock "service" "mwan3rtmon"
} }
main "$@" main "$@"