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

Add check on VPS and IP timeout config in web interface and add loop detection

This commit is contained in:
Ycarus (Yannick Chabanois) 2021-05-19 19:37:17 +02:00
parent 6702b125ca
commit 4c56f5402f
10 changed files with 111 additions and 12 deletions

View file

@ -763,7 +763,7 @@ function interfaces_status()
mArray.openmptcprouter["omr_time"] = os.time()
-- dns
mArray.openmptcprouter["dns"] = false
local timeout = uci:get("openmptcprouter","settings","status_getip_timeout") or "2"
local timeout = uci:get("openmptcprouter","settings","status_getip_timeout") or "1"
local dns_test = sys.exec("dig +timeout=" .. timeout .. " +tries=1 openmptcprouter.com | grep 'ANSWER: 0'")
if dns_test == "" then
mArray.openmptcprouter["dns"] = true
@ -848,7 +848,7 @@ function interfaces_status()
mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter", s[".name"], "omr_version") or ""
mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter",s[".name"],"kernel") or ""
mArray.openmptcprouter["vps_machine"] = uci:get("openmptcprouter",s[".name"],"machine") or ""
timeout = uci:get("openmptcprouter","settings","status_vps_timeout") or "2"
timeout = uci:get("openmptcprouter","settings","status_vps_timeout") or "1"
if uci:get("openmptcprouter",s[".name"],"admin_error") == "1" then
mArray.openmptcprouter["vps_admin_error"] = true
end
@ -1484,6 +1484,10 @@ function interfaces_status()
end
end
end
loop = false
if uci:get("openmptcprouter", interface, "loop") == "1" then
loop = true
end
end
local rx = ""
local tx = ""
@ -1536,6 +1540,7 @@ function interfaces_status()
zonewan = zonewan,
iftype = itype,
state = state,
loop = loop,
}
if ifname ~= nil and ifname:match("^tun.*") then
table.insert(mArray.tunnels, data);