mwan3: use default routes from additional tables

Until now the additional tables listed in gobal 'rt_table_lookup' were
not considered for interfaces.
In order to be able to also use interface-defined routes from tables
other than main, consider also tables listed in 'rt_table_lookup'.
Update version to 2.10.10 as requested by maintainer.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index e4c3aea85fc2e3ca84a18f2d0e1285137eb898e3..e292966531182d8e1594450bb4991a74706b12e3 100644 (file)
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
-PKG_VERSION:=2.10.9
+PKG_VERSION:=2.10.10
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \
                Aaron Goodman <aaronjg@alumni.stanford.edu>

diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh
index 24af3dad52c31be8b7c5b93d46a6295403ed0ae6..a3a5ac89b50b20405920e8042c246e196a1948ed 100644 (file)
--- a/net/mwan3/files/lib/mwan3/mwan3.sh
+++ b/net/mwan3/files/lib/mwan3/mwan3.sh
@@ -408,9 +408,17 @@ mwan3_delete_iface_iptables()
 
 }
 
+mwan3_extra_tables_routes()
+{
+       $IP route list table "$1"
+}
+
 mwan3_get_routes()
 {
-       $IP route list table main | sed -ne "$MWAN3_ROUTE_LINE_EXP" | uniq
+       {
+               $IP route list table main
+               config_list_foreach "globals" "rt_table_lookup" mwan3_extra_tables_routes
+       } | sed -ne "$MWAN3_ROUTE_LINE_EXP" | sort -u
 }
 
 mwan3_create_iface_route()