mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

Add latest version in interface and dynamic master option

Browse source
This commit is contained in:
Ycarus 2018-10-31 12:39:40 +01:00
parent 8ab281e9df
commit 1dbe57436b
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -404,31 +404,32 @@ function settings_add()
ucic:save("shadowsocks-libev") ucic:save("shadowsocks-libev")
ucic:commit("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 -- Set CPU scaling minimum frequency
local scaling_min_freq = luci.http.formvalue("scaling_min_freq") or "" local scaling_min_freq = luci.http.formvalue("scaling_min_freq") or ""
if scaling_min_freq ~= "" then if scaling_min_freq ~= "" then
ucic:set("openmptcprouter","settings","scaling_min_freq",scaling_min_freq) ucic:set("openmptcprouter","settings","scaling_min_freq",scaling_min_freq)
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
end end
-- Set CPU scaling maximum frequency -- Set CPU scaling maximum frequency
local scaling_max_freq = luci.http.formvalue("scaling_max_freq") or "" local scaling_max_freq = luci.http.formvalue("scaling_max_freq") or ""
if scaling_max_freq ~= "" then if scaling_max_freq ~= "" then
ucic:set("openmptcprouter","settings","scaling_max_freq",scaling_max_freq) ucic:set("openmptcprouter","settings","scaling_max_freq",scaling_max_freq)
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
end end
-- Set CPU governor -- Set CPU governor
local scaling_governor = luci.http.formvalue("scaling_governor") or "" local scaling_governor = luci.http.formvalue("scaling_governor") or ""
if scaling_governor ~= "" then if scaling_governor ~= "" then
ucic:set("openmptcprouter","settings","scaling_governor",scaling_governor) ucic:set("openmptcprouter","settings","scaling_governor",scaling_governor)
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
end end
ucic:save("openmptcprouter")
ucic:commit("openmptcprouter")
luci.sys.call("/etc/init.d/openmptcprouter restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/openmptcprouter restart >/dev/null 2>/dev/null")
-- Done, redirect -- Done, redirect
@ -508,6 +509,9 @@ function interfaces_status()
mArray.openmptcprouter = {} mArray.openmptcprouter = {}
mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'")) 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["service_addr"] = uci:get("shadowsocks-libev", "sss0", "server") or ""
mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr") mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr")
mArray.openmptcprouter["server_mptcp"] = "" mArray.openmptcprouter["server_mptcp"] = ""

6
luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
View file

@ -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 %>> <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> </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"> <div class="cbi-value">
<label class="cbi-value-title"><%:Enable ShadowSocks OBFS%></label> <label class="cbi-value-title"><%:Enable ShadowSocks OBFS%></label>
<div class="cbi-value-field"> <div class="cbi-value-field">

6
luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm
View file

@ -73,7 +73,11 @@
if (mArray.openmptcprouter.version) 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 />"; content += "<br />";
} }
if (mArray.openmptcprouter.loadavg) if (mArray.openmptcprouter.loadavg)