From cb02b42007878147b514b1cb86246bfa09615d35 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sat, 3 Jul 2021 15:04:33 +0100 Subject: [PATCH] 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 --- net/mwan3/Makefile | 2 +- net/mwan3/files/lib/mwan3/mwan3.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index e4c3aea85..e29296653 100644 --- 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 , \ Aaron Goodman diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index 24af3dad5..a3a5ac89b 100644 --- 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()