mwan3: update to version 1.5-9

Fix issue where config file would be overwritten in some cases
Fix issue where local address of wan point-to-point links were unreachable from lan

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

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 7839ce207220d92c30fdc2de5c0217bdc89fc4cf..1219527568dcb98ebcf7668b61caedd62f7accb0 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:=8
+PKG_RELEASE:=9
 PKG_MAINTAINER:=Jeroen Louwes <jeroen.louwes@gmail.com>
 PKG_LICENSE:=GPLv2
 
@@ -32,14 +32,14 @@ interfaces, connection tracking and an easy to manage traffic ruleset.
 endef
 
 define Package/mwan3/conffiles
-   /etc/config/mwan3
+/etc/config/mwan3
 endef
 
 define Build/Compile
 endef
 
 define Package/mwan3/install
-   $(CP) ./files/* $(1)
+$(CP) ./files/* $(1)
 endef
 
 $(eval $(call BuildPackage,mwan3))

diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
index ea00bd05fac11520e59c1fd3489a376d5af937a1..d4f4bf004fe7b90cea4106d6aa5f5d651f9c434d 100644 (file)
--- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
+++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -71,6 +71,10 @@ mwan3_set_connected_iptables()
                        $IPT -A mwan3_connected -d $connected_networks -j MARK --set-xmark 0xff00/0xff00
                done
 
+               for connected_networks in $($IP route list table 0 | awk '{print $2}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
+                       $IPT -A mwan3_connected -d $connected_networks -j MARK --set-xmark 0xff00/0xff00
+               done
+
                $IPT -I mwan3_connected -d 224.0.0.0/3 -j MARK --set-xmark 0xff00/0xff00
                $IPT -I mwan3_connected -d 127.0.0.0/8 -j MARK --set-xmark 0xff00/0xff00
        fi