From 1c41df07c4c9e96ce3628a0e5ca5d8d0ddd57647 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 29 Sep 2022 20:42:01 +0200
Subject: [PATCH 1/3] Fix mptcp version and openmptcprouter-vps script

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index df34db4d3..db37d8045 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -757,7 +757,8 @@ _set_mptcp_vps() {
 	scheduler="$(uci -q get network.globals.mptcp_scheduler)"
 	syn_retries="$(uci -q get network.globals.mptcp_syn_retries)"
 	congestion="$(uci -q get network.globals.congestion)"
-	mptcp_version="0"
+	mptcp_version="$(uci -q get network.globals.mptcp_version)"
+	[ -z "$mptcp_version" ] && mptcp_version="0"
 	[ ! -f /proc/sys/net/mptcp/mptcp_enabled ] && mptcp_version="1"
 	[ -z "$congestion" ] && congestion="bbr"
 	if [ "$mptcp_enabled_current" != "$mptcp_enabled" ] || [ "$checksum_current" != "$checksum" ] || ([ "$path_manager_current" != "" ] && [ "$path_manager_current" != "$path_manager" ]) || ([ "$scheduler_current" != "" ] && [ "$scheduler_current" != "$scheduler" ]) || ([ "$syn_retries_current" != "" ] && [ "$syn_retries_current" != "$syn_retries" ]) || [ "$congestion_control_current" != "$congestion" ] || [ "$mptcp_version_current" != "$mptcp_version" ]; then
@@ -1863,7 +1864,7 @@ _get_token() {
 _config_service() {
 	servername=$1
 	vps_config=""
-	servertoken=$(_get_token $servername)
+	tokenserver=$(_get_token $servername)
 	server="$(echo $tokenserver | cut -f1 -d:)"
 	serverport="$(echo $tokenserver | cut -f2 -d:)"
         token="$(echo $tokenserver | cut -f3 -d:)"

From bd97c3d15ed39f72932516b2e1fe53fbfccaa4f3 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 29 Sep 2022 20:42:22 +0200
Subject: [PATCH 2/3] Disable openvpn bonding

---
 .../luasrc/view/openmptcprouter/wizard.htm                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index d3cb34a89..cd1b585b9 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -381,7 +381,7 @@
 			<% if nixio.fs.access("/usr/sbin/mlvpn") then %><option value="mlvpn" <% if uci:get("openmptcprouter","settings","vpn") == "mlvpn" then %>selected="selected"<% end %>>MLVPN</option><% end %>
 			<% if nixio.fs.access("/usr/sbin/ubond") then %><option value="ubond" <% if uci:get("openmptcprouter","settings","vpn") == "ubond" then %>selected="selected"<% end %>>UBOND</option><% end %>
 			<% if nixio.fs.access("/etc/init.d/openvpn") then %><option value="openvpn" <% if uci:get("openmptcprouter","settings","vpn") == "openvpn" then %>selected="selected"<% end %>>OpenVPN</option><% end %>
-			<% if nixio.fs.access("/etc/init.d/openvpnbonding") then %><option value="openvpn_bonding" <% if uci:get("openmptcprouter","settings","vpn") == "openvpn_bonding" then %>selected="selected"<% end %>>OpenVPN Bonding</option><% end %>
+			<!-- <% if nixio.fs.access("/etc/init.d/openvpnbonding") then %><option value="openvpn_bonding" <% if uci:get("openmptcprouter","settings","vpn") == "openvpn_bonding" then %>selected="selected"<% end %>>OpenVPN Bonding</option><% end %> -->
 			<option value="none" <% if uci:get("openmptcprouter","settings","vpn") == "none" then %>selected="selected"<% end %>>None</option>
 		<%
 		end
@@ -535,7 +535,7 @@
 	<hr />
 	<fieldset class="cbi-section" id="interfaces">
 	    <legend><%:Interfaces settings%></legend>
-	    <div class="cbi-section-descr"><%:You must disable DHCP on your modems and set IP in different networks.%></div>
+	    <!-- <div class="cbi-section-descr"><%:You must disable DHCP on your modems and set IP in different networks.%></div> -->
 <% 
     for _, iface in ipairs(net:get_networks()) do
 	local ifname = iface:name()

From a427152a96e98e2216120eb68aa4b84b3c1c4e28 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 30 Sep 2022 08:57:51 +0200
Subject: [PATCH 3/3] Fix Shadowsocks tracker

---
 omr-tracker/files/bin/omr-tracker-ss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index 50337a094..ad12bdf13 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -6,10 +6,10 @@ basename="$(basename $0)"
 
 if [ -f /usr/sbin/iptables-legacy ]; then
 	IPTABLES="/usr/sbin/iptables-legacy"
-	IPTABLESAVE="/usr/sbin/iptables-legacy-save"
+	IPTABLESSAVE="/usr/sbin/iptables-legacy-save"
 else
 	IPTABLES="/usr/sbin/iptables"
-	IPTABLESAVE="/usr/sbin/iptables-save"
+	IPTABLESSAVE="/usr/sbin/iptables-save"
 fi