From: Jonas Lochmann <redacted>
Date: Mon, 1 Jan 2024 00:00:00 +0000 (+0100)
Subject: mwan3: check removed route before removal
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e119a57e97e894f0636df999d82807ae5c494030;p=openwrt-packages.git

mwan3: check removed route before removal

This makes mwan3rtmon check if mwan3_get_routes returns a route
before removing it. This helps with IPv6 routes with source address
selector removal where multiple original routes are transformed to
the same mwan3 route if one of the source routes is removed while
the others are kept.

Signed-off-by: Jonas Lochmann <redacted>
---

diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile
index 76cc12f58..3d4dd36a1 100644
--- a/net/mwan3/Makefile
+++ b/net/mwan3/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3
-PKG_VERSION:=2.11.12
+PKG_VERSION:=2.11.13
 PKG_RELEASE:=2
 PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>, \
 		Aaron Goodman <aaronjg@alumni.stanford.edu>
diff --git a/net/mwan3/files/usr/sbin/mwan3rtmon b/net/mwan3/files/usr/sbin/mwan3rtmon
index d8ccffeb0..5f21d0203 100755
--- a/net/mwan3/files/usr/sbin/mwan3rtmon
+++ b/net/mwan3/files/usr/sbin/mwan3rtmon
@@ -95,6 +95,13 @@ mwan3_rtmon_route_handle()
 	fi
 	route_line=$(echo "$route_line" | sed -ne "$MWAN3_ROUTE_LINE_EXP")
 
+	if [ "$action" = "del" ]; then
+		if mwan3_get_routes | grep -qxF "$route_line"; then
+			LOG debug "deleted but route still exists - $route_line"
+			return
+		fi
+	fi
+
 	handle_route() {
 		local error
 		local iface=$1