From 58679b713bf0da7fd9a04b03ac81f17c40519bb2 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 19 Jun 2022 11:10:04 +0200
Subject: [PATCH 1/2] Reload sqm-autorate when sqm reload

---
 luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm b/luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm
index b3aa47c6d..7f472f725 100755
--- a/luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm
+++ b/luci-app-sqm-autorate/root/etc/uci-defaults/50-luci-sqm
@@ -6,6 +6,11 @@ uci -q batch <<-EOF >/dev/null
 	set ucitrack.@sqm[-1].init=sqm
 	del_list ucitrack.@firewall[0].affects=sqm
 	add_list ucitrack.@firewall[0].affects=sqm
+	delete ucitrack.@sqm-autorate[-1]
+	add ucitrack sqm-autorate
+	set ucitrack.@sqm-autorate[-1].init=sqm-autorate
+	del_list ucitrack.@firewall[0].affects=sqm-autorate
+	add_list ucitrack.@firewall[0].affects=sqm-autorate
 	commit ucitrack
 EOF
 

From 129dc624b34d352631e8ab91df431d3a32aab08b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sun, 19 Jun 2022 11:10:41 +0200
Subject: [PATCH 2/2] Reload FW only on needed server

---
 .../files/usr/share/omr/post-tracking.d/post-tracking | 11 +++++++++--
 openmptcprouter/files/etc/init.d/openmptcprouter-vps  |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
index 57b1412c5..edd7a35f6 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -1669,8 +1669,15 @@ fi
 
 #if [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && ([ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ] || [ -z "$(iptables-save | grep omr_dst_bypass_${OMR_TRACKER_DEVICE})" ]); then
 if [ "$(pgrep -f set_vps_firewall)" = "" ] && [ "$(uci -q show openmptcprouter | grep server)" != "" ] && [ "$(uci -q show openmptcprouter | grep password)" != "" ] && [ "$(pgrep openmptcprouter-vps)" = "" ] && [ "$(uci -q show openmptcprouter | grep admin_error=\'1\')" = "" ] && [ "$(uci -q show openmptcprouter | grep set_firewall=\'1\')" != "" ]; then
-	_log "Set firewall on server"
-	/etc/init.d/openmptcprouter-vps set_vps_firewall >/dev/null 2>&1
+	check_server_fw() {
+		[ "$(uci -q get openmptcprouter.$1.set_firewall)" = "1" ] && {
+			_log "Set firewall on server $1"
+			/etc/init.d/openmptcprouter-vps set_vps_firewall $1 >/dev/null 2>&1
+		}
+	}
+	config_load openmptcprouter
+	config_foreach check_server_fw server
+
 
 	run_fw_include() {
 		[ -n "$1" ] && [ "$(uci -q get firewall.$1.reload)" = "0" ] && sh $(uci -q get firewall.$1.path) >/dev/null 2>&1
diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 1be9331a4..cc6425cdd 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -1191,8 +1191,13 @@ _set_vps_firewall() {
 }
 
 set_vps_firewall() {
-	config_load openmptcprouter
-	config_foreach _set_vps_firewall server
+	local server_opt=$2
+	if [ -n "$server_opt" ]; then
+		_set_vps_firewall $server_opt
+	else
+		config_load openmptcprouter
+		config_foreach _set_vps_firewall server
+	fi
 }
 
 _set_ss_redir() {