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

Use VPS hostname as name

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-07-13 14:55:30 +02:00
parent 554230ea1d
commit 0619b43265
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -785,6 +785,7 @@ function interfaces_status()
mArray.openmptcprouter["vps_admin"] = false mArray.openmptcprouter["vps_admin"] = false
mArray.openmptcprouter["vps_admin_error"] = false mArray.openmptcprouter["vps_admin_error"] = false
mArray.openmptcprouter["vps_admin_error_msg"] = "Not found" mArray.openmptcprouter["vps_admin_error_msg"] = "Not found"
mArray.openmptcprouter["vps_hostname"] = "OpenMPTCProuter Server"
-- Get VPS info -- Get VPS info
ucic:foreach("openmptcprouter", "server", function(s) ucic:foreach("openmptcprouter", "server", function(s)
local serverip = uci:get("openmptcprouter",s[".name"],"ip") or "" local serverip = uci:get("openmptcprouter",s[".name"],"ip") or ""
@ -807,6 +808,7 @@ function interfaces_status()
mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or "" mArray.openmptcprouter["vps_loadavg"] = vpsinfo.vps.loadavg or ""
mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or "" mArray.openmptcprouter["vps_uptime"] = vpsinfo.vps.uptime or ""
mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or "" mArray.openmptcprouter["vps_mptcp"] = vpsinfo.vps.mptcp or ""
mArray.openmptcprouter["vps_hostname"] = vpsinfo.vps.hostname or "OpenMPTCProuter Server"
mArray.openmptcprouter["vps_admin"] = true mArray.openmptcprouter["vps_admin"] = true
mArray.openmptcprouter["vps_status"] = "UP" mArray.openmptcprouter["vps_status"] = "UP"
mArray.openmptcprouter["vps_admin_error_msg"] = "" mArray.openmptcprouter["vps_admin_error_msg"] = ""

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

@ -192,18 +192,18 @@
var equipmentIcon = '<img src="<%=resource%>/server.png" />'; var equipmentIcon = '<img src="<%=resource%>/server.png" />';
if (mArray.openmptcprouter.wan_addr == mArray.openmptcprouter.service_addr) if (mArray.openmptcprouter.wan_addr == mArray.openmptcprouter.service_addr)
{ {
var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr); var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr);
} else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.service_addr == "127.0.0.1") } else if (mArray.openmptcprouter.wan_addr != "" && mArray.openmptcprouter.service_addr == "127.0.0.1")
{ {
var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.wan_addr); var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.wan_addr);
} else if (mArray.openmptcprouter.wan_addr != "") } else if (mArray.openmptcprouter.wan_addr != "")
{ {
var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr); var title = String.format("Direct output (%s)", mArray.openmptcprouter.wan_addr);
} else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN") } else if (mArray.openmptcprouter.ss_addr != "" && mArray.openmptcprouter.vps_status != "DOWN")
{ {
var title = String.format("OpenMPTCProuter Server (%s)", mArray.openmptcprouter.ss_addr); var title = String.format("%s (%s)", mArray.openmptcprouter.vps_hostname, mArray.openmptcprouter.ss_addr);
} else if (mArray.openmptcprouter.external_check == false) { } else if (mArray.openmptcprouter.external_check == false) {
var title = String.format("OpenMPTCProuter Server ?"); var title = String.format("%s ?", mArray.openmptcprouter.vps_hostname);
} else { } else {
var title = "No output"; var title = "No output";
} }
@ -215,7 +215,7 @@
} }
if (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.vps_status == "DOWN") if (mArray.openmptcprouter.wan_addr !== "" && mArray.openmptcprouter.vps_status == "DOWN")
{ {
statusMessage += 'Can\'t access and use OpenMPTCProuter server<br/>'; statusMessage += 'Can\'t access and use server part<br/>';
} }
if (statusMessage !== "") if (statusMessage !== "")
{ {