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

Fix No VPS message

Browse source
This commit is contained in:
Ycarus 2018-12-31 14:53:17 +01:00
parent d5e4f83c7c
commit 8d56160762
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -345,8 +345,10 @@ function wizard_add()
-- Set Glorytun settings -- Set Glorytun settings
if default_vpn:match("^glorytun.*") then if default_vpn:match("^glorytun.*") then
ucic:set("glorytun","vpn","enable",1) ucic:set("glorytun","vpn","enable",1)
ucic:set("network","omrvpn","proto","none")
else else
ucic:set("glorytun","vpn","enable",0) ucic:set("glorytun","vpn","enable",0)
ucic:set("network","omrvpn","proto","dhcp")
end end
local glorytun_key = luci.http.formvalue("glorytun_key") local glorytun_key = luci.http.formvalue("glorytun_key")
@ -670,6 +672,13 @@ function interfaces_status()
end end
end end
if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then
mArray.openmptcprouter["vps_status"] = "DOWN"
else
mArray.openmptcprouter["vps_status"] = "UP"
end
-- 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") local serverip = uci:get("openmptcprouter",s[".name"],"ip")
@ -690,6 +699,7 @@ function interfaces_status()
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_admin"] = true mArray.openmptcprouter["vps_admin"] = true
mArray.openmptcprouter["vps_status"] = "UP"
else else
uci:set("openmptcprouter",s[".name"],"admin_error","1") uci:set("openmptcprouter",s[".name"],"admin_error","1")
uci:delete("openmptcprouter",s[".name"],"token") uci:delete("openmptcprouter",s[".name"],"token")
@ -796,12 +806,6 @@ function interfaces_status()
mArray.openmptcprouter["loadavg"] = sys.exec("cat /proc/loadavg 2>/dev/null"):match("[%d%.]+ [%d%.]+ [%d%.]+") mArray.openmptcprouter["loadavg"] = sys.exec("cat /proc/loadavg 2>/dev/null"):match("[%d%.]+ [%d%.]+ [%d%.]+")
mArray.openmptcprouter["uptime"] = sys.exec("cat /proc/uptime 2>/dev/null"):match("[%d%.]+") mArray.openmptcprouter["uptime"] = sys.exec("cat /proc/uptime 2>/dev/null"):match("[%d%.]+")
if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then
mArray.openmptcprouter["vps_status"] = "DOWN"
else
mArray.openmptcprouter["vps_status"] = "UP"
end
-- overview status -- overview status
mArray.wans = {} mArray.wans = {}
mArray.tunnels = {} mArray.tunnels = {}