From 1dbe57436bfe564b95a1c96076a2b6eb17b27477 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Wed, 31 Oct 2018 12:39:40 +0100
Subject: [PATCH] Add latest version in interface and dynamic master option

---
 .../luasrc/controller/openmptcprouter.lua      | 18 +++++++++++-------
 .../luasrc/view/openmptcprouter/settings.htm   |  6 ++++++
 .../luasrc/view/openmptcprouter/wanstatus.htm  |  6 +++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 10b7e0bcf..b859f7c1c 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -404,31 +404,32 @@ function settings_add()
 
 	ucic:save("shadowsocks-libev")
 	ucic:commit("shadowsocks-libev")
-	
+
+	-- Set master to dynamic or static
+	local master_type = luci.http.formvalue("master_type") or "static"
+	ucic:set("openmptcprouter","settings","master",master_type)
+
 	-- Set CPU scaling minimum frequency
 	local scaling_min_freq = luci.http.formvalue("scaling_min_freq") or ""
 	if scaling_min_freq ~= "" then
 		ucic:set("openmptcprouter","settings","scaling_min_freq",scaling_min_freq)
-		ucic:save("openmptcprouter")
-		ucic:commit("openmptcprouter")
 	end
 
 	-- Set CPU scaling maximum frequency
 	local scaling_max_freq = luci.http.formvalue("scaling_max_freq") or ""
 	if scaling_max_freq ~= "" then
 		ucic:set("openmptcprouter","settings","scaling_max_freq",scaling_max_freq)
-		ucic:save("openmptcprouter")
-		ucic:commit("openmptcprouter")
 	end
 
 	-- Set CPU governor
 	local scaling_governor = luci.http.formvalue("scaling_governor") or ""
 	if scaling_governor ~= "" then
 		ucic:set("openmptcprouter","settings","scaling_governor",scaling_governor)
-		ucic:save("openmptcprouter")
-		ucic:commit("openmptcprouter")
 	end
 
+	ucic:save("openmptcprouter")
+	ucic:commit("openmptcprouter")
+
 	luci.sys.call("/etc/init.d/openmptcprouter restart >/dev/null 2>/dev/null")
 
 	-- Done, redirect
@@ -508,6 +509,9 @@ function interfaces_status()
 	mArray.openmptcprouter = {}
 	mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'"))
 
+	mArray.openmptcprouter["latest_version_omr"] = uci:get("openmptcprouter", "latest_versions", "omr") or ""
+	mArray.openmptcprouter["latest_version_vps"] = uci:get("openmptcprouter", "latest_versions", "vps") or ""
+	
 	mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "sss0", "server") or ""
 	mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr")
 	mArray.openmptcprouter["server_mptcp"] = ""
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index 23948f599..5e5125f3d 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -25,6 +25,12 @@
 		    <input type="checkbox" name="disable_ipv6" class="cbi-input-checkbox" value="1" <% if tonumber((luci.sys.exec("sysctl net.ipv6.conf.all.disable_ipv6")):match(" %d+")) == 1 then %>checked<% end %>>
 		</div>
 	    </div>
+	    <div class="cbi-value">
+		<label class="cbi-value-title"><%:Dynamic master interface%></label>
+		<div class="cbi-value-field">
+		    <input type="checkbox" name="master_type" class="cbi-input-checkbox" value="dynamic" <% if luci.model.uci.cursor():get("openmptcprouter","settings","master") == "dynamic" then %>checked<% end %>>
+		</div>
+	    </div>
 	    <div class="cbi-value">
 		<label class="cbi-value-title"><%:Enable ShadowSocks OBFS%></label>
 		<div class="cbi-value-field">
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
index 6c61c5866..7c4118e31 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
@@ -73,7 +73,11 @@
 
 				if (mArray.openmptcprouter.version)
 				{
-					content += "Version " + mArray.openmptcprouter.version;
+					content += "Version " + mArray.openmptcprouter.version.replace(/\"/g,'');
+					if (mArray.openmptcprouter.latest_version_omr)
+					{
+						content += "<br><i>(Latest available version " + mArray.openmptcprouter.latest_version_omr + ")</i>";
+					}
 					content += "<br />";
 				}
 				if (mArray.openmptcprouter.loadavg)