From 23339d7ae123954b8a879593fc483a52bfe79859 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 4 Apr 2017 15:01:34 +0200 Subject: [PATCH 1/5] net/mwan3: move global mwan3track into main function Signed-off-by: Florian Eckert --- net/mwan3/files/usr/sbin/mwan3track | 134 ++++++++++++++-------------- 1 file changed, 65 insertions(+), 69 deletions(-) diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 1d89b0d9d..64911e94f 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -1,78 +1,74 @@ #!/bin/sh -[ -z "$12" ] && echo "Error: should not be started manually" && exit 0 +main() { -if [ -e /var/run/mwan3track-$1.pid ] ; then - kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null - rm /var/run/mwan3track-$1.pid &> /dev/null -fi + [ -z "$12" ] && echo "Error: should not be started manually" && exit 0 -echo "$$" > /var/run/mwan3track-$1.pid - -score=$(($7+$8)) -track_ips=$(echo $* | cut -d ' ' -f 12-99) -host_up_count=0 -lost=0 -sleep_time=0 - -while true; do - - sleep_time=$6 - - for track_ip in $track_ips; do - ping -I $2 -c $4 -W $5 -s $9 -q $track_ip &> /dev/null - if [ $? -eq 0 ]; then - let host_up_count++ - else - let lost++ - fi - done - - if [ $host_up_count -lt $3 ]; then - let score-- + if [ -e /var/run/mwan3track-$1.pid ] ; then + kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null + rm /var/run/mwan3track-$1.pid &> /dev/null + fi - if [ $score -lt $8 ]; then - score=0 + echo "$$" > /var/run/mwan3track-$1.pid + + local score=$(($7+$8)) + local track_ips=$(echo $* | cut -d ' ' -f 12-99) + local host_up_count=0 + local lost=0 + local sleep_time=0 + + while true; do + + sleep_time=$6 + + for track_ip in $track_ips; do + ping -I $2 -c $4 -W $5 -s $9 -q $track_ip &> /dev/null + if [ $? -eq 0 ]; then + let host_up_count++ + else + let lost++ + fi + done + + if [ $host_up_count -lt $3 ]; then + let score-- + + if [ $score -lt $8 ]; then + score=0 + else + sleep_time=$10 + fi + + if [ $score -eq $8 ]; then + logger -t mwan3track -p notice "Interface $1 ($2) is offline" + env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface + score=0 + fi else - sleep_time=$10 - fi - - if [ $score -eq $8 ]; then - - logger -t mwan3track -p notice "Interface $1 ($2) is offline" - env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface - score=0 - + if [ $score -lt $(($7+$8)) ] && [ $lost -gt 0 ]; then + logger -t mwan3track -p info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)" + fi + + let score++ + lost=0 + + if [ $score -gt $8 ]; then + score=$(($7+$8)) + elif [ $score -le $8 ]; then + sleep_time=$11 + fi + + if [ $score -eq $8 ]; then + logger -t mwan3track -p notice "Interface $1 ($2) is online" + env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface + rm /var/run/mwan3track-$1.pid + exit 0 + fi fi - else - - if [ $score -lt $(($7+$8)) ] && [ $lost -gt 0 ]; then - - logger -t mwan3track -p info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)" - - fi - - let score++ - lost=0 - - if [ $score -gt $8 ]; then - score=$(($7+$8)) - elif [ $score -le $8 ]; then - sleep_time=$11 - fi - - if [ $score -eq $8 ]; then - - logger -t mwan3track -p notice "Interface $1 ($2) is online" - env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface - rm /var/run/mwan3track-$1.pid - exit 0 - fi - fi - - host_up_count=0 - sleep $sleep_time -done + host_up_count=0 + sleep $sleep_time + done +} -exit 1 +main "$@" From 51367883fc7f7530aaa4de5932375aa4e9ce9104 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 4 Apr 2017 15:33:37 +0200 Subject: [PATCH 2/5] net/mwan3: unify logging in mwan3track Signed-off-by: Florian Eckert --- net/mwan3/files/usr/sbin/mwan3track | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 64911e94f..c2a699272 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -1,5 +1,7 @@ #!/bin/sh +LOG="/usr/bin/logger -t $(basename "$0")[$$] -p" + main() { [ -z "$12" ] && echo "Error: should not be started manually" && exit 0 @@ -40,13 +42,13 @@ main() { fi if [ $score -eq $8 ]; then - logger -t mwan3track -p notice "Interface $1 ($2) is offline" + $LOG notice "Interface $1 ($2) is offline" env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface score=0 fi else if [ $score -lt $(($7+$8)) ] && [ $lost -gt 0 ]; then - logger -t mwan3track -p info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)" + $LOG info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)" fi let score++ @@ -59,7 +61,7 @@ main() { fi if [ $score -eq $8 ]; then - logger -t mwan3track -p notice "Interface $1 ($2) is online" + $LOG notice "Interface $1 ($2) is online" env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface rm /var/run/mwan3track-$1.pid exit 0 From 5b55223d80d3bc286b1231b0eebc7f24389e4a41 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 4 Apr 2017 16:00:06 +0200 Subject: [PATCH 3/5] net/mwan3: add clean_up trap function for SIGINT SIGTERM Signed-off-by: Florian Eckert --- net/mwan3/files/lib/mwan3/mwan3.sh | 1 - net/mwan3/files/usr/sbin/mwan3 | 2 -- net/mwan3/files/usr/sbin/mwan3track | 14 +++++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index c3af63583..56b9ce633 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -393,7 +393,6 @@ mwan3_track() if [ -e /var/run/mwan3track-$1.pid ] ; then kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null - rm /var/run/mwan3track-$1.pid &> /dev/null fi if [ -n "$track_ips" ]; then diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index 405cd43f3..63617316c 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -44,7 +44,6 @@ ifdown() if [ -e /var/run/mwan3track-$1.pid ] ; then kill $(cat /var/run/mwan3track-$1.pid) - rm /var/run/mwan3track-$1.pid fi } @@ -129,7 +128,6 @@ stop() local ipset route rule table IP IPT killall mwan3track &> /dev/null - rm /var/run/mwan3track-* &> /dev/null for IP in "$IP4" "$IP6"; do diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index c2a699272..6bfdaa0a7 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -1,17 +1,21 @@ #!/bin/sh LOG="/usr/bin/logger -t $(basename "$0")[$$] -p" +INTERFACE="" + +clean_up() { + $LOG notice "Stopping mwan3track for interface \"${INTERFACE}\"" + rm "/var/run/mwan3track-${INTERFACE}.pid" &> /dev/null + exit 0 +} main() { [ -z "$12" ] && echo "Error: should not be started manually" && exit 0 - if [ -e /var/run/mwan3track-$1.pid ] ; then - kill $(cat /var/run/mwan3track-$1.pid) &> /dev/null - rm /var/run/mwan3track-$1.pid &> /dev/null - fi - + INTERFACE=$1 echo "$$" > /var/run/mwan3track-$1.pid + trap clean_up SIGINT SIGTERM local score=$(($7+$8)) local track_ips=$(echo $* | cut -d ' ' -f 12-99) From 6bb84f69e71da403d4d8c63e85ca8bd4de9bd1c6 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 4 Apr 2017 16:28:18 +0200 Subject: [PATCH 4/5] net/mwan3: decrease parameter invocation of mwan3track Signed-off-by: Florian Eckert --- net/mwan3/files/lib/mwan3/mwan3.sh | 15 ++------- net/mwan3/files/usr/sbin/mwan3track | 47 +++++++++++++++++++---------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index 56b9ce633..ed51b2223 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -382,8 +382,7 @@ mwan3_delete_iface_ipset_entries() mwan3_track() { - local track_ip track_ips reliability count timeout interval down up size - local failure_interval recovery_interval + local track_ip track_ips mwan3_list_track_ips() { @@ -396,17 +395,7 @@ mwan3_track() fi if [ -n "$track_ips" ]; then - config_get reliability $1 reliability 1 - config_get count $1 count 1 - config_get timeout $1 timeout 4 - config_get interval $1 interval 10 - config_get failure_interval $1 failure_interval $interval - config_get recovery_interval $1 recovery_interval $interval - config_get down $1 down 5 - config_get up $1 up 5 - config_get size $1 size 56 - - [ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track $1 $2 $reliability $count $timeout $interval $down $up $size $failure_interval $recovery_interval $track_ips & + [ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track $1 $2 $track_ips & fi } diff --git a/net/mwan3/files/usr/sbin/mwan3track b/net/mwan3/files/usr/sbin/mwan3track index 6bfdaa0a7..5cfff20ed 100755 --- a/net/mwan3/files/usr/sbin/mwan3track +++ b/net/mwan3/files/usr/sbin/mwan3track @@ -1,5 +1,7 @@ #!/bin/sh +. /lib/functions.sh + LOG="/usr/bin/logger -t $(basename "$0")[$$] -p" INTERFACE="" @@ -10,25 +12,38 @@ clean_up() { } main() { + local reliability count timeout interval failure_interval + local recovery_interval down up size - [ -z "$12" ] && echo "Error: should not be started manually" && exit 0 + [ -z "$3" ] && echo "Error: should not be started manually" && exit 0 INTERFACE=$1 echo "$$" > /var/run/mwan3track-$1.pid trap clean_up SIGINT SIGTERM - local score=$(($7+$8)) - local track_ips=$(echo $* | cut -d ' ' -f 12-99) + config_load mwan3 + config_get reliability $1 reliability 1 + config_get count $1 count 1 + config_get timeout $1 timeout 4 + config_get interval $1 interval 10 + config_get down $1 down 5 + config_get up $1 up 5 + config_get size $1 size 56 + config_get failure_interval $1 failure_interval $interval + config_get recovery_interval $1 recovery_interval $interval + + local score=$(($down+$up)) + local track_ips=$(echo $* | cut -d ' ' -f 3-99) local host_up_count=0 local lost=0 local sleep_time=0 while true; do - sleep_time=$6 + sleep_time=$interval for track_ip in $track_ips; do - ping -I $2 -c $4 -W $5 -s $9 -q $track_ip &> /dev/null + ping -I $2 -c $count -W $timeout -s $size -q $track_ip &> /dev/null if [ $? -eq 0 ]; then let host_up_count++ else @@ -36,35 +51,35 @@ main() { fi done - if [ $host_up_count -lt $3 ]; then + if [ $host_up_count -lt $reliability ]; then let score-- - if [ $score -lt $8 ]; then + if [ $score -lt $up ]; then score=0 else - sleep_time=$10 + sleep_time=$failure_interval fi - if [ $score -eq $8 ]; then + if [ $score -eq $up ]; then $LOG notice "Interface $1 ($2) is offline" env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface score=0 fi else - if [ $score -lt $(($7+$8)) ] && [ $lost -gt 0 ]; then - $LOG info "Lost $(($lost*$4)) ping(s) on interface $1 ($2)" + if [ $score -lt $(($down+$up)) ] && [ $lost -gt 0 ]; then + $LOG info "Lost $(($lost*$count)) ping(s) on interface $1 ($2)" fi let score++ lost=0 - if [ $score -gt $8 ]; then - score=$(($7+$8)) - elif [ $score -le $8 ]; then - sleep_time=$11 + if [ $score -gt $up ]; then + score=$(($down+$up)) + elif [ $score -le $up ]; then + sleep_time=$recovery_interval fi - if [ $score -eq $8 ]; then + if [ $score -eq $up ]; then $LOG notice "Interface $1 ($2) is online" env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface rm /var/run/mwan3track-$1.pid From 4d8d889cedfb09bd4dc7db70858eb68abaee443c Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 4 Apr 2017 16:30:21 +0200 Subject: [PATCH 5/5] net/mwan3: update Makefile version Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 0c11b92c7..9d28945e9 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.4 +PKG_VERSION:=2.4.1 PKG_RELEASE:=5 PKG_MAINTAINER:=Florian Eckert PKG_LICENSE:=GPLv2