From 8d41e5477fce77802655bd06a2f5d36432f7b9e1 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 1 Dec 2020 16:02:49 +0100 Subject: [PATCH 1/8] mwan3: fix logger tag in mwan3 init Signed-off-by: Florian Eckert --- net/mwan3/files/etc/init.d/mwan3 | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mwan3/files/etc/init.d/mwan3 b/net/mwan3/files/etc/init.d/mwan3 index fe97b6a08..c34dda767 100755 --- a/net/mwan3/files/etc/init.d/mwan3 +++ b/net/mwan3/files/etc/init.d/mwan3 @@ -6,6 +6,7 @@ START=19 USE_PROCD=1 +SCRIPTNAME="mwan3-init" service_running() { [ -d "$MWAN3_STATUS_DIR" ] From 8f697b45c8f06e7f37b68a440b1e1ae80dfa9716 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Dec 2020 11:39:25 +0100 Subject: [PATCH 2/8] mwan3: fix whitspace Signed-off-by: Florian Eckert --- net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user index be857e8ff..91c62b710 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user +++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user @@ -3,7 +3,7 @@ [ -f "/etc/mwan3.user" ] && { . /lib/functions.sh . /lib/mwan3/mwan3.sh - initscript=/etc/init.d/mwan3 + initscript=/etc/init.d/mwan3 . /lib/functions/procd.sh [ "$MWAN3_SHUTDOWN" != 1 ] && procd_lock From c085f2648f90e68d1670cae639ee1afffb02afc4 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Dec 2020 11:42:37 +0100 Subject: [PATCH 3/8] mwan3: fix MWAN3_STARTUP caller Signed-off-by: Florian Eckert --- net/mwan3/files/etc/hotplug.d/iface/15-mwan3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 index f9212a3a6..32497a5a0 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 +++ b/net/mwan3/files/etc/hotplug.d/iface/15-mwan3 @@ -19,7 +19,7 @@ if { [ "$ACTION" = "ifup" ] || [ "$ACTION" = "connected" ] ; } && [ -z "$DEVICE" exit 3 fi -[ "$MWAN3_STARTUP" = 1 ] || procd_lock +[ "$MWAN3_STARTUP" = "init" ] || procd_lock config_load mwan3 /etc/init.d/mwan3 running || { From 55051e6c7bbb0f32eee95423931c4cbfb569b2ea Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Dec 2020 11:45:55 +0100 Subject: [PATCH 4/8] mwan3: reinstall missing mwan3.user file Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 78eba0f12..9b678ea2d 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -102,6 +102,10 @@ define Package/mwan3/install $(INSTALL_BIN) ./files/usr/sbin/mwan3track \ $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc + $(INSTALL_BIN) ./files/etc/mwan3.user \ + $(1)/etc/ + $(CP) $(PKG_BUILD_DIR)/libwrap_mwan3_sockopt.so.1.0 $(1)/lib/mwan3/ $(INSTALL_DIR) $(1)/etc/uci-defaults From 6133d5a0e957426836410a92d471ac57c59c35a6 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 4 Dec 2020 11:47:43 +0100 Subject: [PATCH 5/8] mwan3: remove unused mwan3_unlock function call Signed-off-by: Florian Eckert --- net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user | 1 - 1 file changed, 1 deletion(-) diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user index 91c62b710..ea509acc8 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user +++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user @@ -16,7 +16,6 @@ config_get_bool enabled "$INTERFACE" enabled 0 [ "${enabled}" -eq 1 ] || { - [ "$MWAN3_SHUTDOWN" != 1 ] && mwan3_unlock "$ACTION" "$DEVICE-user" exit 0 } From 0dbbc58cbc0e832d55edc2edebb52c2197d73473 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 8 Dec 2020 14:46:07 +0100 Subject: [PATCH 6/8] mwan3: fix tab Signed-off-by: Florian Eckert --- net/mwan3/files/lib/mwan3/mwan3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/files/lib/mwan3/mwan3.sh b/net/mwan3/files/lib/mwan3/mwan3.sh index 6821b8503..b99f28231 100644 --- a/net/mwan3/files/lib/mwan3/mwan3.sh +++ b/net/mwan3/files/lib/mwan3/mwan3.sh @@ -79,7 +79,7 @@ mwan3_route_line_dev() unset "$1" [ -z "$route_device" ] && return - curr_table=$(eval "echo \"\$mwan3_dev_tbl_${route_family}\"") + curr_table=$(eval "echo \"\$mwan3_dev_tbl_${route_family}\"") for entry in $curr_table; do if [ "${entry%%=*}" = "$route_device" ]; then _tid=${entry##*=} From 2f58865a01c8ecaa6fc8e715ed7ecd09a0181938 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Tue, 8 Dec 2020 15:26:01 +0100 Subject: [PATCH 7/8] mwan3: fix string check for active_tbls Signed-off-by: Florian Eckert --- net/mwan3/files/usr/sbin/mwan3rtmon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/files/usr/sbin/mwan3rtmon b/net/mwan3/files/usr/sbin/mwan3rtmon index f916f4a9c..96a774783 100755 --- a/net/mwan3/files/usr/sbin/mwan3rtmon +++ b/net/mwan3/files/usr/sbin/mwan3rtmon @@ -56,7 +56,7 @@ mwan3_add_all_routes() tid=0 active_tbls=" " config_foreach add_active_tbls interface - [ $active_tbls = " " ] && return + [ "$active_tbls" = " " ] && return mwan3_get_routes | while read -r route_line; do mwan3_route_line_dev "tid" "$route_line" "$ipv" if [ -n "$tid" ] && [ -z "${active_tbls##* $tid *}" ]; then From 06ce040cbedb9d1779f2aa7722d614a4c9c92a77 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 21 Dec 2020 10:39:38 +0100 Subject: [PATCH 8/8] mwan3: update PKG_VERSION Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 9b678ea2d..87ad0e8a1 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.10.4 +PKG_VERSION:=2.10.5 PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert , \ Aaron Goodman