mwan3: update to version 1.5-10

Fixed issue in mwan3 status output with mwan3 interfaces not yet configuerd in network config
Removed nexthop argument as it is no longer used

Signed-off-by: Jeroen Louwes <jeroen.louwes@gmail.com>

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 1219527568dcb98ebcf7668b61caedd62f7accb0..c0f720bae5f3978e5ab3ca7db18562b69847bf46 100644 (file)
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
 PKG_VERSION:=1.5
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
 PKG_LICENSE:=GPLv2
 

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index d4f4bf004fe7b90cea4106d6aa5f5d651f9c434d..25044c4d396d96bd38eb90f700126dfc75492e73 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -314,7 +314,7 @@ mwan3_ifupdown()
                done
 
                route_args=$($IP route list dev $DEVICE default | head -1 | sed '/.*via \([^ ]*\) .*$/!d;s//via \1/;q' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}')
-               route_args="nexthop $route_args dev $DEVICE"
+               route_args="$route_args dev $DEVICE"
        fi
 
        while [ "$(pgrep -f -o hotplug-call)" -ne $$ -a "$counter" -lt 60 ]; do

diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3
index 5d9f719f10619b4f651967bc58ff06b181dc7177..286603a85a51c12fdaa02d0e1ac4bef6eee33799 100755 (executable)
--- a/net/mwan3/files/usr/sbin/mwan3
+++ b/net/mwan3/files/usr/sbin/mwan3
@@ -74,6 +74,7 @@ interfaces()
        
        check_iface_status()
        {
+               let iface_id++
                device=$(uci get -p /var/state network.$1.ifname) &> /dev/null
 
                if [ -z "$device" ]; then
@@ -82,7 +83,6 @@ interfaces()
                fi
 
                config_get enabled "$1" enabled 0
-               let iface_id++
 
                if [ -n "$(ps -w | grep mwan3track | grep -v grep | sed '/.*\/usr\/sbin\/mwan3track \([^ ]*\) .*$/!d;s//\1/' | awk '$1 == "'$1'"')" ]; then
                        tracking="active"