diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 439cf2fd0..ad7612761 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -410,14 +410,19 @@ function interfaces_status() local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") 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_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") else mArray.openmptcprouter["ss_addr"] = "" + --mArray.openmptcprouter["ss_addr6"] = "" end -- wanaddr 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 mArray.openmptcprouter["ss_addr"] = "" + --mArray.openmptcprouter["ss_addr6"] = "" mArray.openmptcprouter["wan_addr"] = "" + mArray.openmptcprouter["wan_addr6"] = "" end mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or "" diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 3f75351e1..0473dafd7 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -72,18 +72,23 @@ } if (mArray.openmptcprouter.loadavg) { - content += "Load : " + mArray.openmptcprouter.loadavg; + content += "Load: " + mArray.openmptcprouter.loadavg; content += "
"; } if (mArray.openmptcprouter.core_temp) { - content += "Core temp : " + (mArray.openmptcprouter.core_temp / 1000).toFixed(1) + " °"; + content += "Core temp: " + (mArray.openmptcprouter.core_temp / 1000).toFixed(1) + " °"; + content += "
"; + } + if (mArray.openmptcprouter.wan_addr6) + { + content += "IPv6: " + mArray.openmptcprouter.wan_addr6; content += "
"; } if (mArray.openmptcprouter.uptime) { var date = new Date(null); - content += "Uptime : " + String.format('%t', mArray.openmptcprouter.uptime); + content += "Uptime: " + String.format('%t', mArray.openmptcprouter.uptime); content += "
"; } if (mArray.openmptcprouter.dhcpd)