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

Merge pull request #8015 from TDT-AG/pr/20190122-mwan3

Browse source 
mwan3: update version
This commit is contained in:
Hannu Nyman 2019-01-22 20:49:55 +02:00 committed by GitHub
commit ce69b6979e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 8 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.9 PKG_VERSION:=2.7.10
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

8
net/mwan3/files/etc/hotplug.d/iface/15-mwan3
View file

@ -16,11 +16,11 @@ config_load mwan3
config_get_bool enabled globals 'enabled' '0' config_get_bool enabled globals 'enabled' '0'
[ ${enabled} -gt 0 ] || exit 0 [ ${enabled} -gt 0 ] || exit 0
mwan3_lock mwan3_lock "$ACTION" "$INTERFACE"
mwan3_init mwan3_init
mwan3_set_connected_iptables mwan3_set_connected_iptables
mwan3_set_custom_ipset mwan3_set_custom_ipset
mwan3_unlock mwan3_unlock "$ACTION" "$INTERFACE"
config_get enabled $INTERFACE enabled 0 config_get enabled $INTERFACE enabled 0
config_get initial_state $INTERFACE initial_state "online" config_get initial_state $INTERFACE initial_state "online"
@ -58,7 +58,7 @@ else
running=1 running=1
fi fi
mwan3_lock mwan3_lock "$ACTION" "$INTERFACE"
$LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})" $LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
case "$ACTION" in case "$ACTION" in
@ -91,6 +91,6 @@ case "$ACTION" in
;; ;;
esac esac
mwan3_unlock mwan3_unlock "$ACTION" "$INTERFACE"
exit 0 exit 0

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

@ -9,9 +9,9 @@ config_get_bool enabled globals 'enabled' '0'
[ ${enabled} -gt 0 ] || exit 0 [ ${enabled} -gt 0 ] || exit 0
if [ "$ACTION" == "ifup" ]; then if [ "$ACTION" == "ifup" ]; then
mwan3_lock mwan3_lock "$ACTION" "mwan3rtmon"
mwan3_rtmon mwan3_rtmon
mwan3_unlock mwan3_unlock "$ACTION" "mwan3rtmon"
fi fi
exit 0 exit 0

2
net/mwan3/files/lib/mwan3/mwan3.sh
View file

@ -163,9 +163,11 @@ mwan3_init()
mwan3_lock() { mwan3_lock() {
lock /var/run/mwan3.lock lock /var/run/mwan3.lock
# $LOG debug "$1 $2 (lock)"
} }
mwan3_unlock() { mwan3_unlock() {
# $LOG debug "$1 $2 (unlock)"
lock -u /var/run/mwan3.lock lock -u /var/run/mwan3.lock
} }

4
net/mwan3/files/usr/sbin/mwan3
View file

@ -136,6 +136,8 @@ stop()
{ {
local ipset route rule table IP IPT pid local ipset route rule table IP IPT pid
mwan3_lock "command" "mwan3"
for pid in $(pgrep -f "mwan3rtmon"); do for pid in $(pgrep -f "mwan3rtmon"); do
kill -TERM "$pid" > /dev/null 2>&1 kill -TERM "$pid" > /dev/null 2>&1
sleep 1 sleep 1
@ -184,6 +186,8 @@ stop()
$IPS -q destroy $ipset $IPS -q destroy $ipset
done done
mwan3_unlock "command" "mwan3"
mwan3_lock_clean mwan3_lock_clean
rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR

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

@ -23,11 +23,16 @@ main() {
config_get rtmon_interval globals rtmon_interval '5' config_get rtmon_interval globals rtmon_interval '5'
sleep 3 sleep 3
while mwan3_rtmon_ipv4 || mwan3_rtmon_ipv6; do while true; do
mwan3_lock "service" "mwan3rtmon"
[ mwan3_remon_ipv4 = "1" ] || \
[ mwan3_rtmon_ipv6 = "1" ] && break
mwan3_unlock "service" "mwan3rtmon"
[ "$rtmon_interval" = "0" ] && break [ "$rtmon_interval" = "0" ] && break
sleep "$rtmon_interval" & sleep "$rtmon_interval" &
wait wait
done done
mwan3_unlock "service" "mwan3rtmon"
} }
main "$@" main "$@"