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

Display IPv6 in status page

This commit is contained in:
Ycarus 2018-07-08 16:43:51 +02:00
parent a0e4672074
commit 5c6be0092d
2 changed files with 13 additions and 3 deletions

View file

@ -410,14 +410,19 @@ function interfaces_status()
local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") local tracker_port = uci:get("shadowsocks-libev","tracker","local_port")
if tracker_ip ~= "" then if tracker_ip ~= "" then
mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ip.openmptcprouter.com") mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ip.openmptcprouter.com")
--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
else else
mArray.openmptcprouter["ss_addr"] = "" mArray.openmptcprouter["ss_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = ""
end end
-- wanaddr -- wanaddr
mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com") mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com")
mArray.openmptcprouter["wan_addr6"] = sys.exec("wget -6 -qO- -T 1 http://ipv6.openmptcprouter.com")
else else
mArray.openmptcprouter["ss_addr"] = "" mArray.openmptcprouter["ss_addr"] = ""
--mArray.openmptcprouter["ss_addr6"] = ""
mArray.openmptcprouter["wan_addr"] = "" mArray.openmptcprouter["wan_addr"] = ""
mArray.openmptcprouter["wan_addr6"] = ""
end end
mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or "" mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or ""

View file

@ -72,18 +72,23 @@
} }
if (mArray.openmptcprouter.loadavg) if (mArray.openmptcprouter.loadavg)
{ {
content += "Load : " + mArray.openmptcprouter.loadavg; content += "Load: " + mArray.openmptcprouter.loadavg;
content += "<br />"; content += "<br />";
} }
if (mArray.openmptcprouter.core_temp) if (mArray.openmptcprouter.core_temp)
{ {
content += "Core temp : " + (mArray.openmptcprouter.core_temp / 1000).toFixed(1) + " &#176;"; content += "Core temp: " + (mArray.openmptcprouter.core_temp / 1000).toFixed(1) + " &#176;";
content += "<br />";
}
if (mArray.openmptcprouter.wan_addr6)
{
content += "IPv6: " + mArray.openmptcprouter.wan_addr6;
content += "<br />"; content += "<br />";
} }
if (mArray.openmptcprouter.uptime) if (mArray.openmptcprouter.uptime)
{ {
var date = new Date(null); var date = new Date(null);
content += "Uptime : " + String.format('%t', mArray.openmptcprouter.uptime); content += "Uptime: " + String.format('%t', mArray.openmptcprouter.uptime);
content += "<br />"; content += "<br />";
} }
if (mArray.openmptcprouter.dhcpd) if (mArray.openmptcprouter.dhcpd)