From 51cae2dac9dc6a4eea9e978fbdf110625b649115 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 29 Jan 2021 17:28:57 +0100
Subject: [PATCH 01/25] Fix
 https://github.com/Ysurac/openmptcprouter/issues/1547

---
 openmptcprouter/files/bin/omr-test-speed   | 10 +++++++---
 openmptcprouter/files/bin/omr-test-speedv6 | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/openmptcprouter/files/bin/omr-test-speed b/openmptcprouter/files/bin/omr-test-speed
index b01279773..c38fcd9e4 100755
--- a/openmptcprouter/files/bin/omr-test-speed
+++ b/openmptcprouter/files/bin/omr-test-speed
@@ -27,8 +27,12 @@ if [ -z "$INTERFACE" ]; then
 	curl -4 $HOST >/dev/null || echo
 else
 	domain=$(echo $HOST | awk -F/ '{print $3}')
-	hostip=$(dig +nocmd +noall +answer A $domain | grep -v CNAME | awk '{print $5}' | tr -d "\n")
-	ipset add ss_rules_dst_bypass_all $hostip
+	hostip=$(dig +nocmd +noall +answer A $domain | grep -v CNAME | awk '{print $5}' | tr '\n' ' ')
+	for ip in $hostip; do
+		ipset add ss_rules_dst_bypass_all $ip
+	done
 	curl -4 --interface $INTERFACE $HOST >/dev/null || echo
-	ipset del ss_rules_dst_bypass_all $hostip
+	for ip in $hostip; do
+		ipset del ss_rules_dst_bypass_all $ip
+	done
 fi
diff --git a/openmptcprouter/files/bin/omr-test-speedv6 b/openmptcprouter/files/bin/omr-test-speedv6
index 27fd43e68..b80399e5c 100755
--- a/openmptcprouter/files/bin/omr-test-speedv6
+++ b/openmptcprouter/files/bin/omr-test-speedv6
@@ -27,8 +27,12 @@ if [ -z "$INTERFACE" ]; then
 	curl -6 $HOST >/dev/null || echo
 else
 	domain=$(echo $HOST | awk -F/ '{print $3}')
-	hostip=$(dig +nocmd +noall +answer AAAA $domain | grep -v CNAME | awk '{print $5}' | tr -d "\n")
-	ipset add ss_rules6_dst_bypass_all $hostip
+	hostip=$(dig +nocmd +noall +answer AAAA $domain | grep -v CNAME | awk '{print $5}' | tr '\n' ' ')
+	for ip in $hostip; do
+		ipset add ss_rules6_dst_bypass_all $ip
+	done
 	curl -6 --interface $INTERFACE $HOST >/dev/null || echo
-	ipset del ss_rules6_dst_bypass_all $hostip
+	for ip in $hostip; do
+		ipset del ss_rules6_dst_bypass_all $ip
+	done
 fi

From 3a28ad66e5e4c39f33ced6e0808c96aeae81e522 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 29 Jan 2021 17:29:28 +0100
Subject: [PATCH 02/25] Add VLAN support in wizard

---
 .../luasrc/controller/openmptcprouter.lua     |  4 ++++
 .../luasrc/view/openmptcprouter/wizard.htm    | 24 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 62974d55b..4f06cff5b 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -220,6 +220,7 @@ function wizard_add()
 		local typeintf = luci.http.formvalue("cbid.network.%s.type" % intf) or ""
 		local masterintf = luci.http.formvalue("cbid.network.%s.masterintf" % intf) or ""
 		local ifname = luci.http.formvalue("cbid.network.%s.intf" % intf) or ""
+		local vlan = luci.http.formvalue("cbid.network.%s.vlan" % intf) or ""
 		local device_ncm = luci.http.formvalue("cbid.network.%s.device.ncm" % intf) or ""
 		local device_qmi = luci.http.formvalue("cbid.network.%s.device.qmi" % intf) or ""
 		local device_modemmanager = luci.http.formvalue("cbid.network.%s.device.modemmanager" % intf) or ""
@@ -244,6 +245,9 @@ function wizard_add()
 			end
 			ucic:set("network",intf,"type",typeintf)
 		end
+		if vlan ~= "" then
+			ifname=ifname .. '.' .. vlan
+		end
 		if typeintf == "macvlan" and masterintf ~= "" then
 			ucic:set("network",intf,"type","macvlan")
 			ucic:set("network",intf,"masterintf",masterintf)
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index e1fb06c4c..ad0762c8d 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -21,6 +21,17 @@
 		end
 		return true
 	end
+	function splitstring(inputstr, sep)
+		if sep == nil then
+			sep = "%s"
+		end
+		local t={}
+		for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+			table.insert(t, str)
+		end
+		return t
+	end
+
 
 %>
 <script type="text/javascript" src="<%=resource%>/cbi.js?v=git-18.243.49640-2f13420" data-strings="{&#34;path&#34;:{&#34;resource&#34;:&#34;\/luci-static\/resources&#34;,&#34;browser&#34;:&#34;\/cgi-bin\/luci\/admin\/filebrowser&#34;}}"></script>
@@ -537,20 +548,27 @@
 			    <select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.intf" name="cbid.network.<%=ifname%>.intf" size="1">
 			<%
 			    iffind=0
+			    uciifname=uci:get("network",ifname,"ifname")
+			    ifname=splitstring(uciifname,'.')[1] or ""
+			    vlan=splitstring(uciifname,'.')[2] or ""
 			    for _, ifacea in ipairs(ifaces) do
 				if not (ifacea == "lo" or ifacea == "6in4-omr6in4" or ifacea == "mlvpn0" or ifacea:match("^ifb.*") or ifacea:match("^sit.*") or ifacea:match("^gre.*") or ifacea:match("^ip6.*") or ifacea:match("^teql.*") or ifacea:match("^erspan.*") or ifacea:match("^tun.*")) and device_notvirtual(ifacea) then
 			%>
-			<option value="<%=ifacea%>"<% if uci:get("network",ifname,"ifname") == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
+			<option value="<%=ifacea%>"<% if ifname == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
 			<%
 				end
 			    end
 			    if iffind == 0 and uci:get("network",ifname,"ifname") ~= nil then
 			%>
-				<option value="<%=uci:get("network",ifname,"ifname")%>" selected="selected"><%=uci:get("network",ifname,"ifname")%></option>
+				<option value="<%=ifname%>" selected="selected"><%=ifname%></option>
 			<%
 			    end
 			%>
 			    </select>
+		    </div>
+		    <label class="cbi-value-title"><%:VLAN%></label>
+		    <div class="cbi-value-field">
+			    <input type="text" id="cbid.network.<%=ifname%>.vlan" name="cbid.network.<%=ifname%>.vlan" class="cbi-input-text" placeholder="<%:VLAN%>" value="<%=vlan%>" data-type="uinteger" data-optional="false">
 			<br />
 			<div class="cbi-value-description">
 			    <%:Choose physical interface.%>
@@ -885,7 +903,7 @@
 				end
 			    end
 			    for _, ifacea in ipairs(net:get_networks()) do
-				if not (ifacea:name() == "loopback" or ifacea:name() == "omr6in4" or ifacea:name() == "omrvpn" or ifacea:name():match("^omrip.*")) then
+				if not (ifacea:name() == "loopback" or ifacea:name() == "lan" or ifacea:name() == "omr6in4" or ifacea:name() == "omrvpn" or ifacea:name():match("^omrip.*")) then
 			%>
 			<option value="<%='@' .. ifacea:name()%>"><%='@' .. ifacea:name() .. ' (alias)'%></option>
 			<%

From d2aeaf3c2bbadfa0fffe8fbfaa90e735bd089665 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 1 Feb 2021 16:21:02 +0100
Subject: [PATCH 03/25] Update RPI4 firmware

---
 bcm27xx-eeprom/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bcm27xx-eeprom/Makefile b/bcm27xx-eeprom/Makefile
index 8397130ae..6a4dda9b4 100644
--- a/bcm27xx-eeprom/Makefile
+++ b/bcm27xx-eeprom/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bcm27xx-eeprom
-PKG_VERSION:=16bb29427f96dc8276a7102c0526154a1084bffd
-PKG_RELEASE:=3
+PKG_VERSION:=3d6165304cb04bda4454e460dea791b5f92a122a
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=9bf42edbcd5ce38538750860c3c788af435206aa441b7d78cf88d094631dbb14
+PKG_HASH:=d6f25e3d962ea3c770ca1af78466371c47970381b48fb7c2acaf838966d327fc
 
 PKG_LICENSE:=BSD-3-Clause Custom
 PKG_LICENSE_FILES:=LICENSE

From 9432081ec4a42978155c135709a74bfe1278612f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 1 Feb 2021 16:21:58 +0100
Subject: [PATCH 04/25] Fix wizard

---
 .../luasrc/controller/openmptcprouter.lua          |  5 ++++-
 .../luasrc/view/openmptcprouter/wizard.htm         | 14 ++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 4f06cff5b..d64b41986 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -246,7 +246,7 @@ function wizard_add()
 			ucic:set("network",intf,"type",typeintf)
 		end
 		if vlan ~= "" then
-			ifname=ifname .. '.' .. vlan
+			ifname = ifname .. '.' .. vlan
 		end
 		if typeintf == "macvlan" and masterintf ~= "" then
 			ucic:set("network",intf,"type","macvlan")
@@ -905,6 +905,9 @@ function settings_add()
 	-- Enable/disable debug
 	local debug = luci.http.formvalue("debug") or "0"
 	ucic:set("openmptcprouter","settings","debug",debug)
+	ucic:foreach("shadowsocks-libev", "ss_redir", function (section)
+		ucic:set("shadowsocks-libev",section[".name"],"verbose",debug)
+	end)
 
 	-- Enable/disable vnstat backup
 	local savevnstat = luci.http.formvalue("savevnstat") or "0"
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index ad0762c8d..24c67a126 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -549,26 +549,24 @@
 			<%
 			    iffind=0
 			    uciifname=uci:get("network",ifname,"ifname")
-			    ifname=splitstring(uciifname,'.')[1] or ""
+			    realifname=splitstring(uciifname,'.')[1] or ""
 			    vlan=splitstring(uciifname,'.')[2] or ""
 			    for _, ifacea in ipairs(ifaces) do
 				if not (ifacea == "lo" or ifacea == "6in4-omr6in4" or ifacea == "mlvpn0" or ifacea:match("^ifb.*") or ifacea:match("^sit.*") or ifacea:match("^gre.*") or ifacea:match("^ip6.*") or ifacea:match("^teql.*") or ifacea:match("^erspan.*") or ifacea:match("^tun.*")) and device_notvirtual(ifacea) then
 			%>
-			<option value="<%=ifacea%>"<% if ifname == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
+				<option value="<%=ifacea%>"<% if realifname == ifacea then iffind = 1 %> selected="selected"<% end %>><%=ifacea%></option>
 			<%
 				end
 			    end
-			    if iffind == 0 and uci:get("network",ifname,"ifname") ~= nil then
+			    if iffind == 0 and uciifname ~= nil then
 			%>
-				<option value="<%=ifname%>" selected="selected"><%=ifname%></option>
+				<option value="<%=uciifname%>" selected="selected"><%=uciifname%></option>
 			<%
 			    end
 			%>
 			    </select>
-		    </div>
-		    <label class="cbi-value-title"><%:VLAN%></label>
-		    <div class="cbi-value-field">
-			    <input type="text" id="cbid.network.<%=ifname%>.vlan" name="cbid.network.<%=ifname%>.vlan" class="cbi-input-text" placeholder="<%:VLAN%>" value="<%=vlan%>" data-type="uinteger" data-optional="false">
+			<label><%:VLAN%></label>
+			<input type="text" id="cbid.network.<%=ifname%>.vlan" name="cbid.network.<%=ifname%>.vlan" class="cbi-input-text" placeholder="<%:VLAN%>" value="<%=vlan%>" data-optional="true">
 			<br />
 			<div class="cbi-value-description">
 			    <%:Choose physical interface.%>

From 499481490bd47d1ade6f325d99ef3b78d073a9ba Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 1 Feb 2021 16:22:47 +0100
Subject: [PATCH 05/25] Separate rules for bypass

---
 luci-app-omr-bypass/root/etc/init.d/omr-bypass | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
index 82a1e68f5..a859b345e 100755
--- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass
+++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass
@@ -375,13 +375,25 @@ _bypass_proto() {
 _intf_rule_ss_rules() {
 	rule_name=$1
 	[ "$rule_name" = "ss_rules" ] && rule_name="def"
-	if [ "$(iptables --wait=40 -t nat -L -n | grep ssr_${rule_name}_pre_src)" != "" ] && [ "$(iptables-save | grep ssr | grep omr_dst_bypass_$intf)" = "" ]; then
+	if [ "$(iptables --wait=40 -t nat -L -n | grep ssr_${rule_name}_dst)" != "" ] && [ "$(iptables-save | grep ssr_${rule_name}_dst | grep omr_dst_bypass_$intf)" = "" ]; then
 		iptables-restore -w --wait=60 --noflush <<-EOF
 		*nat
 		-I ssr_${rule_name}_dst 1 -m set --match-set omr_dst_bypass_$intf dst -j MARK --set-mark 0x539$count
 		-I ssr_${rule_name}_dst 2 -m mark --mark 0x539$count -j RETURN
+		COMMIT
+		EOF
+	fi
+	if [ "$(iptables --wait=40 -t nat -L -n | grep ssr_${rule_name}_local_out)" != "" ] && [ "$(iptables-save | grep ssr_${rule_name}_local_out | grep omr_dst_bypass_$intf)" = "" ]; then
+		iptables-restore -w --wait=60 --noflush <<-EOF
+		*nat
 		-I ssr_${rule_name}_local_out 1 -m set --match-set omr_dst_bypass_$intf dst -j MARK --set-mark 0x539$count
 		-I ssr_${rule_name}_local_out 2 -m mark --mark 0x539$count -j RETURN
+		COMMIT
+		EOF
+	fi
+	if [ "$(iptables --wait=40 -t nat -L -n | grep ssr_${rule_name}_pre_src)" != "" ] && [ "$(iptables-save | grep ssr_${rule_name}_pre_src | grep omr_dst_bypass_$intf)" = "" ]; then
+		iptables-restore -w --wait=60 --noflush <<-EOF
+		*nat
 		-I ssr_${rule_name}_pre_src 1 -m set --match-set omr_dst_bypass_$intf dst -j MARK --set-mark 0x539$count
 		-I ssr_${rule_name}_pre_src 2 -m mark --mark 0x539$count -j RETURN
 		COMMIT
@@ -493,6 +505,7 @@ _intf_rule() {
 		iptables-restore -w --wait=60 --noflush <<-EOF
 		*mangle
 		-I omr-bypass 1 -m set --match-set omr_dst_bypass_$intf dst -j MARK --set-mark 0x539$count
+		-I omr-bypass-local 1 -m set --match-set omr_dst_bypass_$intf dst -j MARK --set-mark 0x539$count
 		COMMIT
 		EOF
 	fi

From 334fefc2b722b0f3fd0b3c4d870450f986d42c62 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 1 Feb 2021 16:24:37 +0100
Subject: [PATCH 06/25] Add translation option to sysupgrade

---
 .../luasrc/view/sysupgrade.htm                | 12 +++++-----
 .../www/luci-static/resources/sysupgrade.js   | 23 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/luci-app-sysupgrade/luasrc/view/sysupgrade.htm b/luci-app-sysupgrade/luasrc/view/sysupgrade.htm
index ac91611ad..7cb1efa9d 100644
--- a/luci-app-sysupgrade/luasrc/view/sysupgrade.htm
+++ b/luci-app-sysupgrade/luasrc/view/sysupgrade.htm
@@ -75,7 +75,7 @@
 <%+header%>
 <h2 name="content"><%:Sysupgrade%></h2>
 <div class="cbi-map-descr">
-	Easily search and install new releases and package upgrades. Sysupgrade firmware are created on demand based on locally installed packages.
+	<%:Easily search and install new releases and package upgrades.%>
 </div>
 <div style="display: none" id="status_box" class="alert-message info"></div>
 <div style="display: none" id="packages" class="alert-message success"></div>
@@ -87,27 +87,27 @@
 		<div class="cbi-selection-node">
 			<div class="cbi-value" id="keep_container" style="display: none">
 				<div class="cbi-section-descr">
-					Check "Keep settings" to retain the current configuration (requires a compatible firmware).
+					<%:Check "Keep settings" to retain the current configuration.%>
 				</div>
-				<label class="cbi-value-title" for="keep">Keep settings:</label>
+				<label class="cbi-value-title" for="keep"><%:Keep settings:%></label>
 				<div class="cbi-value-field">
 					<input name="keep" id="keep" checked="checked" type="checkbox">
 				</div>
 			</div>
 			<div class="cbi-value" id="edit_button" style="display: none">
 				<div class="cbi-value-field">
-					<input class="cbi-button" value="Edit installed packages" onclick="edit_packages()" type="button">
+					<input class="cbi-button" value="<%:Edit installed packages%>" onclick="edit_packages()" type="button">
 				</div>
 			</div>
 			<div class="cbi-value cbi-value" id="server_div" style="display:none">
-				<label class="cbi-value-title" for="server">Server:</label>
+				<label class="cbi-value-title" for="server"><%:Server:%></label>
 				<div class="cbi-value-field">
 					<input onclick="edit_server()" class="cbi-button cbi-button-edit" value="" type="button" id="server" name="server">
 				</div>
 			</div>
 			<div class="cbi-value cbi-value-last">
 				<div class="cbi-value-field">
-					<input class="cbi-button cbi-button-apply" value="Search for upgrades" style="display: none" onclick="upgrade_check()" type="button" id="upgrade_button">
+					<input class="cbi-button cbi-button-apply" value="<%:Search for upgrades%>" style="display: none" onclick="upgrade_check()" type="button" id="upgrade_button">
 				</div>
 			</div>
 		</div>
diff --git a/luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js b/luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js
index 68d53bf8f..bfb2a83ba 100644
--- a/luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js
+++ b/luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js
@@ -1,3 +1,4 @@
+'require ui';
 function $(s) {
     return document.getElementById(s.substring(1));
 }
@@ -161,7 +162,7 @@ function upgrade_check() {
     var candidates = []
     hide("#status_box");
     hide("#server_div");
-    set_status("info", "Searching for upgrades", true);
+    set_status("info", _("Searching for upgrades"), true);
     fetch(data.url + "/api/versions")
         .then(response => response.json())
         .then(response => {
@@ -188,7 +189,7 @@ function upgrade_check() {
 
             if (candidates.length > 0) {
                 var info_output = "<h3>New release <b>" + candidates[0].latest + "</b> available</h3>"
-                info_output += "Installed version: " + data.release.version
+                info_output += _('Installed version:') + " " + data.release.version
 
                 // tell server the currently installed version
                 request_dict.current_version = request_dict.version;
@@ -205,13 +206,13 @@ function upgrade_check() {
                     show("#edit_button");
                 }
                 var upgrade_button = $("#upgrade_button")
-                upgrade_button.value = "Request firmware";
+                upgrade_button.value = _("Request firmware");
                 upgrade_button.style.display = "block";
                 upgrade_button.disabled = false;
                 upgrade_button.onclick = upgrade_request;
 
             } else {
-                set_status("success", "No upgrades available")
+                set_status("success", _("No upgrades available"))
 
             }
         });
@@ -265,7 +266,7 @@ function upgrade_request_callback(response) {
 
 function flash_image() {
     // Flash image via rpc-sys upgrade_start
-    set_status("warning", "Flashing firmware. Don't unpower device", true)
+    set_status("warning", _("Flashing firmware. Don't unpower device"), true)
     ubus_call("rpc-sys", "upgrade_start", {
         "keep": $("#keep").checked
     }, 'message');
@@ -281,11 +282,11 @@ function ping_ubus() {
         var request = new XMLHttpRequest();
         request.open("GET", ubus_url, true);
         request.addEventListener('error', function(event) {
-            set_status("warning", "Rebooting device - please wait!", true);
+            set_status("warning", _("Rebooting device - please wait!"), true);
             setTimeout(ping_ubus, 5000)
         });
         request.addEventListener('load', function(event) {
-            set_status("success", "Success! Please reload web interface");
+            set_status("success", _("Success! Please reload web interface"));
             $("#upgrade_button").value = "Reload page";
             show("#upgrade_button");
             $("#upgrade_button").disabled = false;
@@ -295,13 +296,13 @@ function ping_ubus() {
         });
         request.send();
     } else {
-        set_status("danger", "Web interface could not reconnect to your device. Please reload web interface or check device manually")
+        set_status("danger", _("Web interface could not reconnect to your device. Please reload web interface or check device manually"))
     }
 }
 
 function upload_image(blob) {
     // Uploads received blob data to the server using cgi-io
-    set_status("info", "Uploading firmware to device", true);
+    set_status("info", _("Uploading firmware to device"), true);
     var request = new XMLHttpRequest();
     var form_data = new FormData();
 
@@ -316,7 +317,7 @@ function upload_image(blob) {
     });
 
     request.addEventListener('error', function(event) {
-        set_status("danger", "Upload of firmware failed, please retry by reloading web interface")
+        set_status("danger", _("Upload of firmware failed, please retry by reloading web interface"))
     });
 
     request.open('POST', origin + '/cgi-bin/cgi-upload');
@@ -340,7 +341,7 @@ function download_image() {
             upload_image(blob)
         }
     };
-    set_status("info", "Downloading firmware to web browser memory", true);
+    set_status("info", _("Downloading firmware to web browser memory"), true);
     download_request.send();
 }
 

From 72f75b823b96863595e920ed44f23fc89b86762b Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 2 Feb 2021 10:32:40 +0100
Subject: [PATCH 07/25] Add sysupgrade translation template

---
 .../po/templates/attendedsysupgrade.pot       | 11 ---
 .../po/templates/sysupgrade.pot               | 81 +++++++++++++++++++
 2 files changed, 81 insertions(+), 11 deletions(-)
 delete mode 100644 luci-app-sysupgrade/po/templates/attendedsysupgrade.pot
 create mode 100644 luci-app-sysupgrade/po/templates/sysupgrade.pot

diff --git a/luci-app-sysupgrade/po/templates/attendedsysupgrade.pot b/luci-app-sysupgrade/po/templates/attendedsysupgrade.pot
deleted file mode 100644
index c14f0951e..000000000
--- a/luci-app-sysupgrade/po/templates/attendedsysupgrade.pot
+++ /dev/null
@@ -1,11 +0,0 @@
-msgid ""
-msgstr "Content-Type: text/plain; charset=UTF-8"
-
-#: applications/luci-app-attendedsysupgrade/luasrc/view/attendedsysupgrade.htm:76
-#: applications/luci-app-attendedsysupgrade/root/usr/share/luci/menu.d/luci-app-attendedsysupgrade.json:3
-msgid "Attended Sysupgrade"
-msgstr ""
-
-#: applications/luci-app-attendedsysupgrade/root/usr/share/rpcd/acl.d/attendedsysupgrade.json:3
-msgid "attended sysupgrade via rpcd and luci"
-msgstr ""
diff --git a/luci-app-sysupgrade/po/templates/sysupgrade.pot b/luci-app-sysupgrade/po/templates/sysupgrade.pot
new file mode 100644
index 000000000..0c4a913f0
--- /dev/null
+++ b/luci-app-sysupgrade/po/templates/sysupgrade.pot
@@ -0,0 +1,81 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:90
+msgid "Check \"Keep settings\" to retain the current configuration."
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:344
+msgid "Downloading firmware to web browser memory"
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:78
+msgid "Easily search and install new releases and package upgrades."
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:99
+msgid "Edit installed packages"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:269
+msgid "Flashing firmware. Don't unpower device"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:192
+msgid "Installed version:"
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:92
+msgid "Keep settings:"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:215
+msgid "No upgrades available"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:285
+msgid "Rebooting device - please wait!"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:209
+msgid "Request firmware"
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:110
+msgid "Search for upgrades"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:165
+msgid "Searching for upgrades"
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:103
+msgid "Server:"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:289
+msgid "Success! Please reload web interface"
+msgstr ""
+
+#: luci-app-sysupgrade/luasrc/view/sysupgrade.htm:76
+#: luci-app-sysupgrade/root/usr/share/luci/menu.d/luci-app-sysupgrade.json:3
+msgid "Sysupgrade"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:320
+msgid "Upload of firmware failed, please retry by reloading web interface"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:305
+msgid "Uploading firmware to device"
+msgstr ""
+
+#: luci-app-sysupgrade/root/www/luci-static/resources/sysupgrade.js:299
+msgid ""
+"Web interface could not reconnect to your device. Please reload web "
+"interface or check device manually"
+msgstr ""
+
+#: luci-app-sysupgrade/root/usr/share/rpcd/acl.d/sysupgrade.json:3
+msgid "sysupgrade via rpcd and luci"
+msgstr ""

From 78799489c88998391e14178bdc8cdd68f69955b1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:02:08 +0100
Subject: [PATCH 08/25] Fix wizard shadowsocks server enable

---
 .../luasrc/controller/openmptcprouter.lua                 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index d64b41986..859252e71 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -477,7 +477,9 @@ function wizard_add()
 		ucic:set("v2ray","main","enabled","0")
 		ucic:foreach("shadowsocks-libev", "server", function(s)
 			local sectionname = s[".name"]
-			ucic:set("shadowsocks-libev",sectionname,"disabled","0")
+			if sectionname:match("^sss.*") then
+				ucic:set("shadowsocks-libev",sectionname,"disabled","0")
+			end
 		end)
 	elseif default_proxy == "v2ray" and serversnb > 0 and serversnb > disablednb then
 		--ucic:set("shadowsocks-libev","sss0","disabled","1")
@@ -543,7 +545,7 @@ function wizard_add()
 					local nbip = 0
 					for _, ssip in pairs(server_ips) do
 						ucic:set("shadowsocks-libev","sss" .. nbip,"server",ssip)
-						if default_proxy == "shadowsocks" then
+						if default_proxy == "shadowsocks" and serversnb > disablednb then
 							ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","0")
 						end
 						nbip = nbip + 1
@@ -573,7 +575,7 @@ function wizard_add()
 				local nbip = 0
 				for _, ssip in pairs(server_ips) do
 					ucic:set("shadowsocks-libev","sss" .. nbip,"server",ssip)
-					if default_proxy == "shadowsocks" then
+					if default_proxy == "shadowsocks" and serversnb > disablednb then
 						ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","0")
 					end
 					nbip = nbip + 1

From bdbdc201ec632dbfabdc948b28ecc0eff860c6b8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:03:03 +0100
Subject: [PATCH 09/25] Fix shadowsocks iptables rules

---
 shadowsocks-libev/files/shadowsocks-libev.init | 4 +++-
 shadowsocks-libev/files/ss-rules               | 2 +-
 shadowsocks-libev/files/ss-rules6              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init
index 9e15c6241..fa1b1602d 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/shadowsocks-libev/files/shadowsocks-libev.init
@@ -308,6 +308,7 @@ start_service() {
 	# Add rule to match traffic marked by firewall for bypass
 	ip rule add prio 1 fwmark 0x539 lookup 991337 > /dev/null 2>&1
 	rules_up
+	[ -f /etc/firewall.gre-tunnel ] && sh /etc/firewall.gre-tunnel > /dev/null 2>&1
 }
 
 stop_service() {
@@ -320,7 +321,7 @@ reload_service() {
 }
 
 rules_exist() {
-	[ -n "$(iptables -t nat -L -n | grep ssr)" ] && return 0
+	[ -n "$(iptables-save | grep 'A ssr')" ] && return 0
 	return 1
 }
 
@@ -347,6 +348,7 @@ rules_up() {
 		config_foreach ss_rules_restart "$cfgtype" "$cfgtype"
 	done
 	config_foreach ss_rules ss_rules
+	[ -z "$(iptables-save | grep :ssr)" ] && logger -t "Shadowsocks" "Rules not applied"
 	[ -f /etc/init.d/omr-bypass ] && {
 		logger -t "Shadowsocks" "Reload omr-bypass rules"
 		/etc/init.d/omr-bypass reload_rules
diff --git a/shadowsocks-libev/files/ss-rules b/shadowsocks-libev/files/ss-rules
index 396de706d..2f4583e47 100755
--- a/shadowsocks-libev/files/ss-rules
+++ b/shadowsocks-libev/files/ss-rules
@@ -187,7 +187,7 @@ ss_rules_iptchains_init_tcp() {
 		forward) local_target=ssr_${rule}_forward ;;
 		bypass|*) return 0;;
 	esac
-	if [ "$(iptables -t nat -L ssr_${rule}_local_out | grep ssr_${rule}_dst_bypass)" = "" ]; then
+	if [ "$(iptables-save | grep ssr_${rule}_local_out | grep ssr_${rule}_dst_bypass)" = "" ]; then
 		iptables-restore -w --noflush <<-EOF
 			*nat
 			:ssr_${rule}_local_out -
diff --git a/shadowsocks-libev/files/ss-rules6 b/shadowsocks-libev/files/ss-rules6
index 84d04beb5..3225573a1 100755
--- a/shadowsocks-libev/files/ss-rules6
+++ b/shadowsocks-libev/files/ss-rules6
@@ -175,7 +175,7 @@ ss_rules6_iptchains_init_tcp() {
 		:ssr6_${rule}_local_out -
 		-I OUTPUT 1 -p tcp -j ssr6_${rule}_local_out
 		-A ssr6_${rule}_local_out -m set --match-set ssr6_${rule}_dst_bypass dst -j RETURN
-		-A ssr6_${rule}_local_out -m set --match-set ssr6_${rule}_dst_bypass_all dst -j RETURN
+		-A ssr6_${rule}_local_out -m set --match-set ss_rules6_dst_bypass_all dst -j RETURN
 		-A ssr6_${rule}_local_out -m set --match-set ssr6_${rule}_dst_bypass_ dst -j RETURN
 		-A ssr6_${rule}_local_out -m mark --mark 0x6539 -j RETURN
 		-A ssr6_${rule}_local_out -p tcp $o_ipt_extra -j $local_target -m comment --comment "local_default: $o_local_default"

From 398d47d1fd20f235502ac15c03896d9b2847dee9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:08:05 +0100
Subject: [PATCH 10/25] Add nano

---
 openmptcprouter-full/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile
index 74968b5c8..f5b008643 100644
--- a/openmptcprouter-full/Makefile
+++ b/openmptcprouter-full/Makefile
@@ -50,6 +50,7 @@ MY_DEPENDS := \
     speedtestc \
     iftop \
     htop \
+    nano \
     tcpdump \
     ethtool \
     iputils-ping \

From e90e6eab51a3b1752ff52a355065afcc50522848 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:09:33 +0100
Subject: [PATCH 11/25] Add sss1 server for secondary server ip and rename
 ss_redir hi to hi1

---
 .../etc/uci-defaults/1930-omr-shadowsocks     | 50 ++++++++++++-------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
index 69da0ea91..8460546c3 100755
--- a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
+++ b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
@@ -1,6 +1,13 @@
 #!/bin/sh
 # Copyright (C) 2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter project
 
+if [ "$(uci -q get shadowsocks-libev.hi)" != ""; then
+	uci -q batch <<-EOF >/dev/null
+		rename shadowsocks-libev.hi="hi1"
+		commit shadowsocks-libev
+	EOF
+fi
+
 if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 	NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")
 	if [ "$NBCPU" -gt 2 ]; then
@@ -26,24 +33,16 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 		fi
 	fi
 
-	if [ "$(uci -q get shadowsocks-libev.hi.timeout)" != "1000" ]; then
-		uci -q batch <<-EOF > /dev/null
-			set shadowsocks-libev.hi.timeout=1000
-			commit shadowsocks-libev
-		EOF
-		for c in $(seq 2 $NBCPU); do
+	if [ "$(uci -q get shadowsocks-libev.hi1.timeout)" != "1000" ]; then
+		for c in $(seq 1 $NBCPU); do
 			uci -q batch <<-EOF > /dev/null
 				set shadowsocks-libev.hi$c.timeout=1000
 				commit shadowsocks-libev
 			EOF
 		done
 	fi
-	if [ "$(uci -q get shadowsocks-libev.hi.mode)" != "tcp" ]; then
-		uci -q batch <<-EOF > /dev/null
-			set shadowsocks-libev.hi.mode=tcp_and_udp
-			commit shadowsocks-libev
-		EOF
-		for c in $(seq 2 $NBCPU); do
+	if [ "$(uci -q get shadowsocks-libev.hi1.mode)" != "tcp" ]; then
+		for c in $(seq 1 $NBCPU); do
 			uci -q batch <<-EOF > /dev/null
 				set shadowsocks-libev.hi$c.mode=tcp_and_udp
 				commit shadowsocks-libev
@@ -51,12 +50,16 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 		done
 	fi
 fi
+
 if [ "$(uci -q get shadowsocks-libev.hi3)" != "" ]; then
-	port=1101
-	for c in $(seq 3 2 $NBCPU); do
+	port=1100
+	for c in $(seq 1 2 $NBCPU); do
 		uci -q batch <<-EOF >/dev/null
 			set shadowsocks-libev.hi$c.local_port=$port
+			set shadowsocks-libev.hi$c.server=sss0
 			set shadowsocks-libev.hi$((c+1)).local_port=$port
+				set shadowsocks-libev.hi$((c+1)).local_address="::"
+			set shadowsocks-libev.hi$((c+1)).server=sss1
 			commit shadowsocks-libev
 		EOF
 		port=$((port+1))
@@ -70,9 +73,9 @@ fi
 if [ "$(uci -q get shadowsocks-libev.hi.obfs)" = "1" ]; then
 	uci -q batch <<-EOF > /dev/null
 		set shadowsocks-libev.sss0.obfs=1
-		set shadowsocks-libev.sss0.obfs_plugin="$(uci -q get shadowsocks-libev.hi.obfs_plugin)"
-		set shadowsocks-libev.sss0.obfs_host="$(uci -q get shadowsocks-libev.hi.obfs_host)"
-		set shadowsocks-libev.sss0.obfs_type="$(uci -q get shadowsocks-libev.hi.obfs_type)"
+		set shadowsocks-libev.sss0.obfs_plugin="$(uci -q get shadowsocks-libev.hi1.obfs_plugin)"
+		set shadowsocks-libev.sss0.obfs_host="$(uci -q get shadowsocks-libev.hi1.obfs_host)"
+		set shadowsocks-libev.sss0.obfs_type="$(uci -q get shadowsocks-libev.hi1.obfs_type)"
 		commit shadowsocks-libev
 	EOF
 fi
@@ -85,12 +88,23 @@ if [ "$(uci -q get shadowsocks-libev.ss_rules.server)" = "" ]; then
 fi
 
 
-if [ "$(uci -q get ucitrack.@shadowsocks-libev[*1].affects | grep openmptcprouter-vps)" = "" ]; then
+if [ "$(uci -q get ucitrack.@shadowsocks-libev[-1].affects | grep openmptcprouter-vps)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add_list ucitrack.@shadowsocks-libev[-1].affects="openmptcprouter-vps"
 		commit ucitrack
 	EOF
 fi
 
+if [ "$(uci -q get shadowsocks-libev.sss1)" = "" ]; then
+	uci -q batch <<-EOF > /dev/null
+		set shadowsocks-libev.sss1=server
+		set shadowsocks-libev.sss1.server_port='65101'
+		set shadowsocks-libev.sss1.method='chacha20-ietf-poly1305'
+		set shadowsocks-libev.sss1.obfs='0'
+		set shadowsocks-libev.sss1.disabled='1'
+		commit shadowsocks-libev
+	EOF
+fi
+
 rm -f /tmp/luci-indexcache
 exit 0

From 29b20d0e98735673c910c7067b6d16961b58f95f Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:10:01 +0100
Subject: [PATCH 12/25] Set FS check by default

---
 openmptcprouter/files/etc/uci-defaults/2060-omr-system | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
index 70beaade9..787763c26 100755
--- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system
+++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system
@@ -8,8 +8,6 @@ uci -q batch <<-EOF >/dev/null
 	commit rpcd
 	set luci.apply.timeout='20'
 	commit luci
-	set fstab.@global[0].check_fs='1'
-	commit fstab
 EOF
 
 if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
@@ -20,6 +18,10 @@ if [ "$(uci -q get rpcd.@rpcd[0].socket)" != "/var/run/ubus/ubus.sock" ]; then
 fi
 
 /sbin/block detect > /etc/config/fstab
+uci -q batch <<-EOF >/dev/null
+	set fstab.@global[0].check_fs='1'
+	commit fstab
+EOF
 
 [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && {
 	# force CPU speed for RPI

From 4be600968078affff2b01ea6f6d3c48102b3fa9c Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 11:10:37 +0100
Subject: [PATCH 13/25] Fix routes in post tracking

---
 mptcp/files/usr/share/omr/post-tracking.d/post-tracking | 6 +++---
 1 file changed, 3 insertions(+), 3 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 eb495ac43..27031e506 100755
--- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
+++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking
@@ -164,7 +164,7 @@ set_routes_intf() {
 			interface_gw=$(ubus call network.interface.${INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
 		fi
 		#if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ] && [ "$(ip route show $serverip | grep $interface_if)" = "" ]; then
-		if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ] && [ -n "$(echo $interface_gw | grep :)" ]; then
+		if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ] && [ -z "$(echo $interface_gw | grep :)" ]; then
 			if [ "$multipath_config_route" = "master" ]; then
 				weight=10
 			else
@@ -827,7 +827,7 @@ if [ "$multipath_config" = "master" ]; then
 			config_foreach set_route_balancing interface
 			config_foreach set_route_balancing6 interface
 			[ -n "$routesbalancing" ] && {
-				([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 0 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancing " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show default metric 0 | grep $OMR_TRACKER_DEVICE)" = "" ] && [ -n "$OMR_TRACKER_DEVICE_IP" ]) && {
+				([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 0 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancing " ]) || ([ "$nbintf" = "1" ] && ([ "$(ip r show default metric 0 | grep $OMR_TRACKER_DEVICE)" = "" ] || [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]) && [ -n "$OMR_TRACKER_DEVICE_IP" ]) && {
 					_log "Set ip route replace default scope global $routesbalancing"
 					ip route replace default scope global metric 0 $routesbalancing
 				}
@@ -839,7 +839,7 @@ if [ "$multipath_config" = "master" ]; then
 				}
 			}
 			[ -n "$routesbalancingbackup" ] && {
-				([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 999 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancingbackup " ]) || ([ "$nbintf" = "1" ] && [ "$(ip r show default metric 999 | grep $OMR_TRACKER_DEVICE)" = "" ] && [ -n "$OMR_TRACKER_DEVICE_IP" ]) && {
+				([ "$nbintf" -gt "1" ] && [ "$(ip r show default metric 999 | tr -d '\t' | tr -d '\n')" != "default via $routesbalancingbackup " ]) || ([ "$nbintf" = "1" ] && ([ "$(ip r show default metric 999 | grep $OMR_TRACKER_DEVICE)" = "" ] || [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]) && [ -n "$OMR_TRACKER_DEVICE_IP" ]) && {
 					_log "Set backup ip route replace default scope global $routesbalancingbackup"
 					ip route replace default scope global metric 999 $routesbalancingbackup
 				}

From b4013edd0c88d34449cf7beda0c82f6960469ece Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:43:22 +0100
Subject: [PATCH 14/25] Display ifname if not same as label

---
 .../luasrc/view/openmptcprouter/wanstatus.htm |  19 +-
 .../po/templates/openmptcprouter.pot          | 489 ++++++++++--------
 2 files changed, 289 insertions(+), 219 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 1aa626cd5..83f601bbf 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -404,17 +404,26 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					}
 					// Populate info
 					var wanip    = mArray.wans[i].wanip;
-					var wanip6   = mArray.wans[i].wanip6;
 					if (anonymize == "true" && testPrivateIP(wanip) == false)
 					{
 						wanip=replaceLastNChars(wanip,"x",6);
 					}
+					var wanip6   = mArray.wans[i].wanip6;
+					if (anonymize == "true")
+					{
+						wanip6=replaceLastNChars(wanip6,"x",6);
+					}
 					var ipaddr    = mArray.wans[i].ipaddr;
-					var ip6addr   = mArray.wans[i].ip6addr;
 					if (anonymize == "true" && testPrivateIP(ipaddr) == false)
 					{
 						ipaddr=replaceLastNChars(ipaddr,"x",6);
 					}
+					var ip6addr   = mArray.wans[i].ip6addr;
+					if (anonymize == "true")
+					{
+						ip6addr=replaceLastNChars(ip6addr,"x",6);
+					}
+					var ifname    = mArray.wans[i].ifname;
 					var whois     = mArray.wans[i].whois;
 					var whois6    = mArray.wans[i].whois6;
 					var signal    = mArray.wans[i].signal;
@@ -469,7 +478,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:ip address:%>', ipaddr);
 					}
-					if(ip6addr !== '' && gateway6 != '')
+					if(ip6addr !== '' && gateway6 !== '')
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:ipv6 address:%>', ip6addr);
 					}
@@ -481,6 +490,10 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm
 					{
 						content += String.format('%s <strong>%s</strong><br />','<%:wan ipv6 address:%>', wanip6);
 					}
+					if(ifname !== '' && ifname !== mArray.wans[i].label)
+					{
+						content += String.format('%s %s<br />','<%:interface:%>', ifname);
+					}
 					if(whois !== '')
 					{
 						content += String.format('%s %s<br />','<%:whois:%>', whois);
diff --git a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
index 4daf598a7..684de3447 100644
--- a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
+++ b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot
@@ -1,28 +1,34 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:256
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:274
 msgid "A Dead Simple VPN is a TCP VPN that can replace Glorytun TCP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:251
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:253
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:269
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:271
 msgid "A Dead Simple VPN key"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:73
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:77
+msgid ""
+"A secondary server IP can be set for dual IPv4/IPv6 server contact if WAN "
+"IPv6 are set"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:88
 msgid "API username to retrieve personnalized settings from the server."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:654
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:732
 msgid "APN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:118
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:133
 msgid "Add a new server"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:827
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:912
 msgid "Add an interface"
 msgstr ""
 
@@ -31,11 +37,11 @@ msgstr ""
 msgid "Advanced Settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:125
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:140
 msgid "Advanced settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:333
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:351
 msgid ""
 "All VPN available here can do aggregation over MPTCP or using own internal "
 "method."
@@ -45,18 +51,18 @@ msgstr ""
 msgid "All router settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:225
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:243
 msgid ""
 "An Advanced Encryption Standard (AES) instruction set is integrated in the "
 "processor."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:680
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:758
 msgid "Authentication Type"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:718
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:734
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:796
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:812
 msgid "Backup"
 msgstr ""
 
@@ -73,60 +79,60 @@ msgstr ""
 msgid "Beta"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:296
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:307
 msgid "Big time difference between the server and the router"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:478
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:496
 msgid "Bridge"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:236
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:254
 msgid "By default VPN is used for any traffic that is not TCP."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:170
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:188
 msgid ""
 "By default proxy is used for any traffic that is TCP (and UDP for V2Ray)."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:685
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:763
 msgid "CHAP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:257
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:268
 msgid "Can\\'t access and use server part"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:283
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:294
 msgid "Can\\'t contact Server Admin Script"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:273
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:284
 msgid "Can\\'t get public IP address from ShadowSocks"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:276
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:287
 msgid "Can\\'t get public IP address from V2Ray"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:270
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:281
 msgid "Can\\'t ping server"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:482
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:500
 msgid ""
 "Choose MacVLAN if you want to create a virtual interface based on a physical "
 "interface."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:416
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:502
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:548
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:434
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:520
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:572
 msgid "Choose physical interface."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:123
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:138
 msgid "Common server settings"
 msgstr ""
 
@@ -134,11 +140,15 @@ msgstr ""
 msgid "Core temp:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:368
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:513
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:386
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:531
 msgid "DHCP"
 msgstr ""
 
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:532
+msgid "DHCPv6"
+msgstr ""
+
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:188
 msgid "DNS issue: can\\'t resolve hostname"
 msgstr ""
@@ -147,22 +157,22 @@ msgstr ""
 msgid "Debug"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:172
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:190
 msgid "Default Proxy"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:304
 msgid "Default VPN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:52
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:457
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:63
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:475
 msgid "Delete"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:580
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:607
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:628
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:658
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:685
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:706
 msgid "Device"
 msgstr ""
 
@@ -211,7 +221,7 @@ msgstr ""
 msgid "Disable renaming interfaces"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:106
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:121
 msgid "Disable server"
 msgstr ""
 
@@ -227,12 +237,13 @@ msgstr ""
 msgid "Disable tracebox test"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:716
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:732
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:166
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:794
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:810
 msgid "Disabled"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:778
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:856
 msgid "Download speed (Kb/s)"
 msgstr ""
 
@@ -241,11 +252,11 @@ msgid "Dynamic change"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:187
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:148
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:163
 msgid "Enable IPv6"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:768
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:846
 msgid "Enable SQM"
 msgstr ""
 
@@ -261,16 +272,17 @@ msgstr ""
 msgid "Enable debug logs"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:715
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:731
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:167
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:793
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:809
 msgid "Enabled"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:208
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:226
 msgid "Encryption"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:229
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:247
 msgid "Encryption method is used for Shadowsocks, V2Ray, Glorytun and OpenVPN."
 msgstr ""
 
@@ -278,29 +290,30 @@ msgstr ""
 msgid "Filesystem is readonly"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:140
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:155
 msgid "Force retrieve all keys from server."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:135
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:150
 msgid "Force retrieve settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:674
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:752
 msgid "GPRS only"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:504
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:665
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:552
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:555
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:727
 msgid "Gateway DOWN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:244
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:262
 msgid "Glorytun TCP is used by default for UDP and ICMP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:239
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:241
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:257
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:259
 msgid "Glorytun key"
 msgstr ""
 
@@ -340,30 +353,40 @@ msgstr ""
 msgid "IPv4 TCP SYN retries2"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:424
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:554
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:442
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:578
 msgid "IPv4 address"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:570
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:594
 msgid "IPv4 gateway"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:430
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:564
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:448
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:588
 msgid "IPv4 netmask"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:158
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:176
 msgid "IPv6 Prefix"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:544
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:705
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:608
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:635
+msgid "IPv6 address"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:622
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:645
+msgid "IPv6 gateway"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:600
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:767
 msgid "IPv6 route received"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:146
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:161
 msgid "IPv6 settings"
 msgstr ""
 
@@ -371,44 +394,44 @@ msgstr ""
 msgid "IPv6 tunnel DOWN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:336
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:347
 msgid "IPv6:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:443
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:461
 msgid "Interfaces settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:193
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:203
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:244
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:256
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:268
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:280
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:211
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:221
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:262
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:274
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:298
 msgid "Key is retrieved from server API by default."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:83
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:98
 msgid ""
 "Key to configure and retrieve others keys from Server and to set server "
 "settings from OpenMPTCProuter."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:341
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:359
 msgid "LAN interfaces settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:672
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:750
 msgid "LTE"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:352
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:463
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:370
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:481
 msgid "Label"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:358
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:468
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:376
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:486
 msgid "Label for the interface"
 msgstr ""
 
@@ -417,42 +440,42 @@ msgid "Last available backup on server:"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:124
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:313
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:324
 msgid "Latest available version"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:130
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:319
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:330
 msgid "Load:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:268
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:286
 msgid "MLVPN can replace Glorytun with connections with same latency"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:263
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:265
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:281
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:283
 msgid "MLVPN password"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:292
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:303
 msgid "MPTCP is not enabled on the server"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:330
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:341
 msgid "MPTCP may not be enabled on the server"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:758
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:836
 msgid "MPTCP over VPN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:477
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:495
 msgid "MacVLAN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:717
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:733
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:795
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:811
 msgid "Master"
 msgstr ""
 
@@ -468,15 +491,15 @@ msgstr ""
 msgid "Minimum scaling CPU frequency"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:669
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:747
 msgid "Modem default"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:703
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:781
 msgid "Modem init timeout"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:514
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:533
 msgid "ModemManager"
 msgstr ""
 
@@ -484,43 +507,43 @@ msgstr ""
 msgid "More than one default VPN is enabled"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:712
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:728
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:790
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:806
 msgid "Multipath TCP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:527
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:533
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:688
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:694
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:583
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:589
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:750
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:756
 msgid "Multipath current state is"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:522
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:683
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:578
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:745
 msgid "Multipath master already defined"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:507
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:668
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:558
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:730
 msgid "Multipath seems to be blocked on the connection"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:515
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:534
 msgid "NCM"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:683
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:761
 msgid "NONE"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:539
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:700
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:595
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:762
 msgid "Network interface duplicated"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:800
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:802
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:862
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:864
 msgid "Network overview"
 msgstr ""
 
@@ -528,8 +551,8 @@ msgstr ""
 msgid "Networks settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:497
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:658
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:545
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:720
 msgid "No IP defined"
 msgstr ""
 
@@ -537,15 +560,19 @@ msgstr ""
 msgid "No IPv6 access"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:511
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:672
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:562
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:734
 msgid "No Server ping response after 1 second"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:279
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:290
 msgid "No WAN IP address detected in less than 1 second"
 msgstr ""
 
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:619
+msgid "No WAN with multipath enabled:"
+msgstr ""
+
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/backup.htm:26
 msgid "No available backup on server."
 msgstr ""
@@ -554,33 +581,33 @@ msgstr ""
 msgid "No change"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:720
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:782
 msgid "No data"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:501
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:662
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:549
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:724
 msgid "No gateway defined"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:248
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:249
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:259
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:260
 msgid "No output"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:253
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:264
 msgid "No server IP address, No WAN IP address"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:266
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:277
 msgid "No server defined"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:214
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:232
 msgid "None"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:476
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:494
 msgid "Normal"
 msgstr ""
 
@@ -606,17 +633,17 @@ msgstr ""
 msgid "On wizard change"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:182
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:200
 msgid "Only ShadowSocks is supported with server multiple IPs for now."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:722
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:800
 msgid ""
 "Only one interface must be set as \"Master\", this should be the most stable "
 "interface."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:97
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:112
 msgid "Only one server can be master, else all servers are set as backup."
 msgstr ""
 
@@ -624,7 +651,7 @@ msgstr ""
 msgid "OpenMPTCProuter"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:333
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:351
 msgid "OpenVPN can't be used in multi VPS configuration."
 msgstr ""
 
@@ -632,8 +659,8 @@ msgstr ""
 msgid "Optimize for latency instead of bandwidth"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:369
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:518
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:387
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:537
 msgid "Other"
 msgstr ""
 
@@ -641,46 +668,50 @@ msgstr ""
 msgid "Other settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:684
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:762
 msgid "PAP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:686
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:764
 msgid "PAP/CHAP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:697
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:775
 msgid "PAP/CHAP password"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:691
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:769
 msgid "PAP/CHAP username"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:660
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:738
 msgid "PIN code"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:516
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:535
 msgid "PPPoE"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:381
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:487
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:527
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:399
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:505
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:546
 msgid "Physical interface"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:670
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:748
 msgid "Prefer LTE"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:671
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:749
 msgid "Prefer UMTS"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:363
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:508
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:71
+msgid "Primary server IP"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:381
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:526
 msgid "Protocol"
 msgstr ""
 
@@ -688,15 +719,15 @@ msgstr ""
 msgid "Proxy is DISABLED"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:169
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:187
 msgid "Proxy settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:341
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:352
 msgid "Proxy traffic:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:517
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:536
 msgid "QMI"
 msgstr ""
 
@@ -708,12 +739,12 @@ msgstr ""
 msgid "Restore backup"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:133
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:148
 msgid "Retrieve settings from server"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:352
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:836
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:921
 msgid "Save & Apply"
 msgstr ""
 
@@ -729,7 +760,11 @@ msgstr ""
 msgid "Scaling governor"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:830
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:72
+msgid "Secondary server IP"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:915
 msgid "Select the device you want to base the interface on."
 msgstr ""
 
@@ -737,64 +772,67 @@ msgstr ""
 msgid "Send backup"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:58
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:60
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:69
 msgid "Server IP"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:62
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:74
 msgid "Server IP will be set for proxy and VPN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:78
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:80
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:93
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:95
 msgid "Server key"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:43
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:42
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:53
 msgid "Server settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:68
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:70
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:83
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:85
 msgid "Server username"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:666
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:744
 msgid "Service Type"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:559
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:583
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:613
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:640
 msgid "Set an IP in the same network as the modem"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:575
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:599
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:627
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:650
 msgid "Set here IP of the modem"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:92
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:107
 msgid "Set server as master"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:181
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:199
 msgid ""
 "Set the default Proxy used for TCP when ShadowSocks is enabled, for TCP and "
 "UDP when V2Ray is enabled."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:333
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:351
 msgid ""
 "Set the default VPN used for ICMP (and UDP if proxy used is shadowsocks), "
 "for all traffic if proxy is disabled."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:788
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:866
 msgid ""
 "Set value between 80-95% of max download speed link. 0 to disable SQM/QoS."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:804
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:882
 msgid ""
 "Set value between 80-95% of max upload speed link. 0 to disable SQM/QoS."
 msgstr ""
@@ -807,12 +845,12 @@ msgstr ""
 msgid "ShadowSocks is not running"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:193
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:211
 msgid "ShadowSocks is used for TCP."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:188
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:190
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:206
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:208
 msgid "ShadowSocks key"
 msgstr ""
 
@@ -820,8 +858,8 @@ msgstr ""
 msgid "Show all settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:367
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:512
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:385
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:530
 msgid "Static address"
 msgstr ""
 
@@ -840,7 +878,7 @@ msgid ""
 "local end."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:227
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:245
 msgid ""
 "There is no Advanced Encryption Standard (AES) instruction set integrated in "
 "the processor, you should use chacha20."
@@ -859,24 +897,24 @@ msgid ""
 "retransmissions remain unacknowledged."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:351
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:362
 msgid "Total traffic:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:473
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:491
 msgid "Type"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:280
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:298
 msgid "UBOND can replace Glorytun with connections with same latency"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:275
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:277
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:293
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:295
 msgid "UBOND password"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:673
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:751
 msgid "UMTS/GPRS"
 msgstr ""
 
@@ -893,17 +931,17 @@ msgstr ""
 msgid "Update server"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:794
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:872
 msgid "Upload speed (Kb/s)"
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:141
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:325
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:336
 msgid "Uptime:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:783
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:799
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:861
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:877
 msgid "Used by Glorytun UDP and SQM/QoS if enabled. 0 to use default value."
 msgstr ""
 
@@ -911,27 +949,32 @@ msgstr ""
 msgid "V2Ray is not running"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:203
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:221
 msgid "V2Ray is used for TCP and UDP."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:200
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:218
 msgid "V2Ray user"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:198
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:216
 msgid "V2Ray user id"
 msgstr ""
 
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:568
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:569
+msgid "VLAN"
+msgstr ""
+
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:184
 msgid "VPN is not running"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:235
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:253
 msgid "VPN settings"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:346
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:357
 msgid "VPN traffic:"
 msgstr ""
 
@@ -939,12 +982,13 @@ msgstr ""
 msgid "VPN tunnel DOWN"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:306
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:317
 msgid "Version"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:515
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:676
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:566
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:571
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:738
 msgid "Wan IP and gateway are identical"
 msgstr ""
 
@@ -955,10 +999,10 @@ msgid ""
 msgstr ""
 
 #: luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm:258
-msgid "When proxy shadowsocks is used, use it for UDP if proxy down"
+msgid "When proxy shadowsocks is used, use it for UDP if VPN down"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:40
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:51
 msgid "Wizard"
 msgstr ""
 
@@ -967,33 +1011,33 @@ msgstr ""
 msgid "You"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:763
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:841
 msgid "You can enable MPTCP over VPN if your provider filter Multipath TCP."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:373
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:391
 msgid "You can use DHCP if you have multiple real ethernet ports."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:522
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:541
 msgid ""
 "You can use DHCP if you have multiple real ethernet ports. Select other if "
 "you want to use another protocol available in Network Interfaces page."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:163
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:181
 msgid "You can use a public IPv6 prefix only if you set only one server."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:444
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:462
 msgid "You must disable DHCP on your modems and set IP in different networks."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:153
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:171
 msgid "You should disable IPv6 here if server doesn't provide IPv6."
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:773
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:851
 msgid "You should disable SQM for LTE or any interfaces with variable speed."
 msgstr ""
 
@@ -1009,7 +1053,7 @@ msgstr ""
 msgid "address:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:675
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:753
 msgid "auto"
 msgstr ""
 
@@ -1017,35 +1061,43 @@ msgstr ""
 msgid "empty key"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:447
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:638
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:495
+msgid "interface:"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:479
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:700
 msgid "ip address:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:459
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:650
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:483
+msgid "ipv6 address:"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:507
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:712
 msgid "latency:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:463
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:654
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:511
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:716
 msgid "mtu:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:551
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:707
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:607
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:769
 msgid "multipath:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:467
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:515
 msgid "operator:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:218
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm:236
 msgid "other"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:471
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:519
 msgid "phone number:"
 msgstr ""
 
@@ -1053,21 +1105,26 @@ msgstr ""
 msgid "range:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:475
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:523
 msgid "state:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:554
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:710
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:610
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:772
 msgid "traffic control:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:451
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:642
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:487
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:704
 msgid "wan address:"
 msgstr ""
 
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:455
-#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:646
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:491
+msgid "wan ipv6 address:"
+msgstr ""
+
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:499
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:503
+#: luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm:708
 msgid "whois:"
 msgstr ""

From 33b9626a33d51f702cb70927ef86a73e7037cfc8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:44:00 +0100
Subject: [PATCH 15/25] No error if board description not available

---
 .../luci-static/resources/view/dashboard/include/10_router.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js b/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
index 5b57f6126..759818be1 100644
--- a/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
+++ b/luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/include/10_router.js
@@ -368,7 +368,7 @@ return baseclass.extend({
 
 			release: {
 				title: _('Firmware Version'),
-				value: boardinfo.release.description
+				value: boardinfo.release.description ? boardinfo.release.description : null
 			}
 		};
 

From 4dd42e32c0ac1d28d3d2f601d1e8432f5bc80327 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:44:30 +0100
Subject: [PATCH 16/25] Change way to detect if shadowsocks iptables rules
 applied

---
 omr-tracker/files/bin/omr-tracker-ss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index be0074b01..bffca1732 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -76,7 +76,7 @@ while true; do
 			uci -q set openmptcprouter.omr.ss_${server}="up"
 			uci -q commit openmptcprouter.omr
 		}
-		if [ -z "$(iptables -t nat -L -n | grep ss_rules)" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.disabled)" != "1" ]; then
+		if [ -z "$(iptables-save | grep :ssr)" ] && [ "$(uci -q get shadowsocks-libev.ss_rules.disabled)" != "1" ]; then
 			_log "Reload Shadowsocks rules"
 			/etc/init.d/shadowsocks-libev rules_up 2> /dev/null
 			_get_ip

From c7e9b2aceb4ba7ca630adf4c4930120f396810e1 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:45:54 +0100
Subject: [PATCH 17/25] Set omrvpn as external interface for upnpd

---
 openmptcprouter/files/etc/uci-defaults/2092-upnpd | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100755 openmptcprouter/files/etc/uci-defaults/2092-upnpd

diff --git a/openmptcprouter/files/etc/uci-defaults/2092-upnpd b/openmptcprouter/files/etc/uci-defaults/2092-upnpd
new file mode 100755
index 000000000..a89804ab6
--- /dev/null
+++ b/openmptcprouter/files/etc/uci-defaults/2092-upnpd
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$(uci -q get upnpd.config.external_ifac)" != "omrvpn" ]; then
+	uci -q batch <<-EOF >/dev/null
+		set upnpd.config.external_iface=omrvpn
+		commit upnpd
+	EOF
+fi
+
+exit 0

From 73f577c515508aa6fb5ff218b2699a9405967bfe Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:46:30 +0100
Subject: [PATCH 18/25] only set dns over https settings on first boot

---
 openmptcprouter/files/etc/uci-defaults/1940-omr-dns | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
index 93471310a..662442e18 100755
--- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
+++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns
@@ -40,7 +40,7 @@ if [ "$(uci -q get dhcp.lan.dhcp_options)" = "" ]; then
 	EOF
 fi
 
-if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ] && [ "$(uci -q get https-dns-proxy.@https-dns-proxy[0].listen_port)" = "5053" ]; then
+if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
 #	uci -q batch <<-EOF >/dev/null
 #		delete https-dns-proxy.@https-dns-proxy[-1]
 #		delete https-dns-proxy.@https-dns-proxy[-1]

From 55d4722aca1dc6877ec24a7a88a1f1c753221ac8 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Thu, 4 Feb 2021 14:47:12 +0100
Subject: [PATCH 19/25] Update copyright

---
 v2ray-core/files/etc/init.d/v2ray     | 2 +-
 v2ray-core/files/usr/bin/v2ray-rules  | 2 +-
 v2ray-core/files/usr/bin/v2ray-rules6 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2ray-core/files/etc/init.d/v2ray b/v2ray-core/files/etc/init.d/v2ray
index 34acc668b..d7d25942d 100755
--- a/v2ray-core/files/etc/init.d/v2ray
+++ b/v2ray-core/files/etc/init.d/v2ray
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 #
 # Copyright 2019-2020 Xingwang Liao <kuoruan@gmail.com>
-# Copyright 2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
+# Copyright 2020-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
 # Licensed to the public under the MIT License.
 #
 
diff --git a/v2ray-core/files/usr/bin/v2ray-rules b/v2ray-core/files/usr/bin/v2ray-rules
index a43b19be7..98978f12e 100755
--- a/v2ray-core/files/usr/bin/v2ray-rules
+++ b/v2ray-core/files/usr/bin/v2ray-rules
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # Copyright (C) 2017 Yousong Zhou <yszhou4tech@gmail.com>
-# Copyright (C) 2018-2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
+# Copyright (C) 2018-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org> for OpenMPTCProuter
 #
 # The design idea was derived from ss-rules by Jian Chang <aa65535@live.com>
 #
diff --git a/v2ray-core/files/usr/bin/v2ray-rules6 b/v2ray-core/files/usr/bin/v2ray-rules6
index b05c70c59..5e1714110 100755
--- a/v2ray-core/files/usr/bin/v2ray-rules6
+++ b/v2ray-core/files/usr/bin/v2ray-rules6
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 #
 # Copyright (C) 2017 Yousong Zhou <yszhou4tech@gmail.com>
-# Copyright (C) 2018-2020 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
+# Copyright (C) 2018-2021 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 #
 # The design idea was derived from ss-rules by Jian Chang <aa65535@live.com>
 #

From 7d9545aa4015567c345f2e7a11534d2c3b4b95eb Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:47:16 +0100
Subject: [PATCH 20/25] Fix for IPv6 in wizard

---
 .../luasrc/controller/openmptcprouter.lua      | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 859252e71..bc7b55188 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -251,7 +251,7 @@ function wizard_add()
 		if typeintf == "macvlan" and masterintf ~= "" then
 			ucic:set("network",intf,"type","macvlan")
 			ucic:set("network",intf,"masterintf",masterintf)
-		elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" ) then
+		elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" or proto == "dhcpv6") then
 			ucic:set("network",intf,"ifname",ifname)
 		elseif typeintf == "" and device ~= "" and proto == "ncm" then
 			ucic:set("network",intf,"device",device_ncm)
@@ -295,6 +295,11 @@ function wizard_add()
 			ucic:set("network",intf,"ip6addr","")
 			ucic:set("network",intf,"ip6gw","")
 		end
+		
+		if proto == "dhcpv6" then
+			ucic:set("network",intf,"reqaddress","try")
+			ucic:set("network",intf,"reqprefix","auto")
+		end
 
 		ucic:delete("openmptcprouter",intf,"lc")
 		ucic:save("openmptcprouter")
@@ -437,6 +442,11 @@ function wizard_add()
 				table.insert(aserverips,ip)
 			end
 		end
+		if disableipv6 == "1" then
+			if table.getn(aserverips) == 2 then
+				table.remove(aserverips, 2)
+			end
+		end
 
 		local master = luci.http.formvalue("master") or ""
 
@@ -548,6 +558,9 @@ function wizard_add()
 						if default_proxy == "shadowsocks" and serversnb > disablednb then
 							ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","0")
 						end
+						if disableipv6 == "1" and nbip > 0 then
+							break
+						end
 						nbip = nbip + 1
 					end
 				end
@@ -579,6 +592,9 @@ function wizard_add()
 						ucic:set("shadowsocks-libev","sss" .. nbip,"disabled","0")
 					end
 					nbip = nbip + 1
+					if disableipv6 == "1" and nbip > 0 then
+						break
+					end
 				end
 			end
 		end

From f27860f81ffa65a69d9c40498864848633aa59b9 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:47:47 +0100
Subject: [PATCH 21/25] Display only one input for server IP in wizard if IPv6
 disabled

---
 .../luasrc/view/openmptcprouter/wizard.htm            | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index 24c67a126..8ddce55b0 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -65,7 +65,16 @@
 	    </div>
 	    <h3><%=servername%></h3>
 	    <div class="cbi-section-node" id="cbi-omr-wizard-<%=servername%>">
-		<div class="cbi-value">
+		<div class="cbi-value" id="<%=servername%>.server_ip" data-depends="[{&#34;enableipv6&#34;:&#34;1&#34;}]" data-index="8">
+		    <label class="cbi-value-title" for="server_ip.1"><%:Server IP%></label>
+		    <div class="cbi-value-field">
+			    <input name="<%=servername%>.serverip.ip1" id="<%=servername%>.server_ip.1" placeholder="<%:Server IP%>" class="cbi-input-text" value="<%=uci:get_list("openmptcprouter",servername,"ip")[1]%>" data-optional="false">
+			<div class="cbi-value-description">
+			    <%:Server IP will be set for proxy and VPN%>
+			</div>
+		    </div>
+		</div>
+		<div class="cbi-value" id="<%=servername%>.server_ipv6" data-depends="[{&#34;enableipv6&#34;:&#34;0&#34;}]" data-index="8">
 		    <label class="cbi-value-title" for="server_ip.1"><%:Server IP%></label>
 		    <div class="cbi-value-field">
 			    <input name="<%=servername%>.serverip.ip1" id="<%=servername%>.server_ip.1" placeholder="<%:Primary server IP%>" class="cbi-input-text" value="<%=uci:get_list("openmptcprouter",servername,"ip")[1]%>" data-optional="false">

From 44b12433567d36c14610e5c5c4eaaab8b8f6d2f6 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:48:15 +0100
Subject: [PATCH 22/25] Add log on omr-tracker-ss

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

diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss
index bffca1732..58a17ed5b 100755
--- a/omr-tracker/files/bin/omr-tracker-ss
+++ b/omr-tracker/files/bin/omr-tracker-ss
@@ -72,7 +72,7 @@ while true; do
 	if [ "$(curl -s -I -w %{http_code} --socks5 ${proxy} --max-time ${timeout} $host -o /dev/null)" != "000" ]; then
 		nocontact=""
 		[ "${last}" -ge "${retry}" ] || [ "$(uci -q get openmptcprouter.omr.ss_${server})" = "" ] && {
-			_log "Shadowsocks is up (can contact via http ${host})"
+			_log "Shadowsocks ${server} is up (can contact via http ${host})"
 			uci -q set openmptcprouter.omr.ss_${server}="up"
 			uci -q commit openmptcprouter.omr
 		}
@@ -87,8 +87,8 @@ while true; do
 		last=$((last + 1 ))
 		[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
 		[ "${last}" -ge "${retry}" ] && {
-			if [ -n "$(iptables -t nat -L -n | grep ssr)" ]; then
-				_log "Shadowsocks is down (can't contact via http ${nocontact})"
+			if [ -n "$(iptables -w -t nat -L -n | grep ssr)" ]; then
+				_log "Shadowsocks ${server} is down (can't contact via http ${nocontact})"
 				uci -q set openmptcprouter.omr.ss_${server}="down"
 				uci -q commit openmptcprouter.omr
 				[ "$(uci show openmptcprouter.omr | grep ss | grep up)" = "" ] && /etc/init.d/shadowsocks-libev rules_down 2> /dev/null

From a1a7c39923ab4099f4281b6cacbee636e39ae233 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:48:56 +0100
Subject: [PATCH 23/25] Fix omr-tracker for ss-tracker

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

diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker
index 77765c19c..467817e91 100755
--- a/omr-tracker/files/etc/init.d/omr-tracker
+++ b/omr-tracker/files/etc/init.d/omr-tracker
@@ -139,6 +139,7 @@ _initialize_shadowsocks_tracker() {
 	#redir_tcp=$(uci -q get shadowsocks-libev.ss_rules.redir_tcp)
 	#config_get tracker_server ss_rules server
 	config_get ss_disabled $server disabled 0
+	[ "$ss_disabled" = "0" ] && ss_enable="1"
 	[ -z "$(uci -q get shadowsocks-libev.tracker_${server})" ] && [ "$ss_disabled" != "1" ] && {
 		logger -t "omr-tracker" "Create ShadowSock tracker ss_local..."
 		uci -q batch <<-EOF >/dev/null
@@ -230,7 +231,7 @@ _gre_tunnel() {
 }
 
 start_service() {
-	local ss_disabled
+	local ss_enable=0
 	logger -t "omr-tracker" "Launching..."
 	config_load shadowsocks-libev
 	config_foreach _initialize_shadowsocks_tracker server
@@ -238,7 +239,7 @@ start_service() {
 	config_load network
 	config_foreach _launch_tracker interface
 
-	if [ "$ss_disabled" != "1" ]; then
+	if [ "$ss_enable" = "1" ]; then
 		config_load shadowsocks-libev
 		config_foreach _launch_shadowsocks_tracker ss_local
 	#elif [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ]; then

From d77382ac8c7ccb48930aeb64e1ae98c28448313d Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:49:19 +0100
Subject: [PATCH 24/25] Fix openmptcprouter vps login

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index 853891f9d..5241b9fbc 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -37,6 +37,7 @@ _login() {
 			[ -z "$auth" ] && return
 			token="$(echo "$auth" | jsonfilter -q -e '@.access_token')"
 			uci -q set openmptcprouter.${servername}.token="$token"
+			[ -n "$token" ] && break
 		}
 		config_load openmptcprouter
 		config_list_foreach ${servername} ip login_on_server

From 9476921bd52050ee1e2ba7454190a041d9007729 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Fri, 5 Feb 2021 19:49:59 +0100
Subject: [PATCH 25/25] Rename shadowsocks ss-redir from hi to hi1

---
 openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks | 4 ++--
 shadowsocks-libev/files/shadowsocks-libev.config            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
index 8460546c3..5880c13b0 100755
--- a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
+++ b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks
@@ -3,7 +3,7 @@
 
 if [ "$(uci -q get shadowsocks-libev.hi)" != ""; then
 	uci -q batch <<-EOF >/dev/null
-		rename shadowsocks-libev.hi="hi1"
+		rename shadowsocks-libev.hi=hi1
 		commit shadowsocks-libev
 	EOF
 fi
@@ -70,7 +70,7 @@ if [ "$(uci -q get shadowsocks-libev.hi3)" != "" ]; then
 	EOF
 fi
 
-if [ "$(uci -q get shadowsocks-libev.hi.obfs)" = "1" ]; then
+if [ "$(uci -q get shadowsocks-libev.hi1.obfs)" = "1" ]; then
 	uci -q batch <<-EOF > /dev/null
 		set shadowsocks-libev.sss0.obfs=1
 		set shadowsocks-libev.sss0.obfs_plugin="$(uci -q get shadowsocks-libev.hi1.obfs_plugin)"
diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config
index 2bf7def6b..719a9cc85 100644
--- a/shadowsocks-libev/files/shadowsocks-libev.config
+++ b/shadowsocks-libev/files/shadowsocks-libev.config
@@ -1,4 +1,4 @@
-config ss_redir hi
+config ss_redir hi1
 	option server 'sss0'
 	option local_address '::'
 	option local_port '1100'