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 and check if server and router times are accurate

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-11-07 22:39:28 +01:00
parent f2ad6afca4
commit 5bae10f4fb
2 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -69,17 +69,17 @@
var equipmentIcon = '<img src="<%=resource%>/computer.png" />'; var equipmentIcon = '<img src="<%=resource%>/computer.png" />';
if (mArray.openmptcprouter.remote_addr) if (mArray.openmptcprouter.remote_addr)
{ {
if (mArray.openmptcprouter.remote_from_lease) if (mArray.openmptcprouter.remote_from_lease == false)
{ {
var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
var statusMessageClass = "";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
var statusMessage = "";
} else {
var title = String.format("%s (%s)",'You', mArray.openmptcprouter.remote_addr); var title = String.format("%s (%s)",'You', mArray.openmptcprouter.remote_addr);
var statusMessageClass = "warning"; var statusMessageClass = "warning";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png"; var statusIcon = "<%=resource%>/openmptcprouter/images/statusWarning.png";
var statusMessage = _('Your IP was not leased by this router'); var statusMessage = _('Your IP was not leased by this router');
} else {
var title = String.format('<br /><strong>%s (%s)</strong>', mArray.openmptcprouter.remote_hostname ? mArray.openmptcprouter.remote_hostname : _('You'), mArray.openmptcprouter.remote_addr)
var statusMessageClass = "";
var statusIcon = "<%=resource%>/openmptcprouter/images/statusOK.png";
var statusMessage = "";
} }
} else { } else {
var title = String.format('<br /><strong>%s</strong>', _('Clients')) var title = String.format('<br /><strong>%s</strong>', _('Clients'))
@ -261,6 +261,10 @@
{ {
statusMessage += _('MPTCP is not enabled on the server') + '<br/>'; statusMessage += _('MPTCP is not enabled on the server') + '<br/>';
} }
if (mArray.openmptcprouter.vps_time_accurate == false)
{
statusMessage += _('Big time difference between the server and the router') + '<br/>';
}
if (statusMessage !== "" && statusMessageClass !== "error") if (statusMessage !== "" && statusMessageClass !== "error")
{ {
statusMessageClass = "warning"; statusMessageClass = "warning";

20
luci-app-openmptcprouter/root/usr/libexec/rpcd/openmptcprouter
View file

@ -1,7 +1,6 @@
#!/usr/bin/env lua #!/usr/bin/env lua
local math = require "math" local math = require "math"
local tools = require "luci.tools.status"
local sys = require "luci.sys" local sys = require "luci.sys"
local json = require("luci.json") local json = require("luci.json")
local fs = require("nixio.fs") local fs = require("nixio.fs")
@ -642,6 +641,7 @@ function interfaces_status()
end) end)
mArray.openmptcprouter["server_mptcp"] = "" mArray.openmptcprouter["server_mptcp"] = ""
mArray.openmptcprouter["omr_time"] = os.time()
-- dns -- dns
mArray.openmptcprouter["dns"] = false mArray.openmptcprouter["dns"] = false
local dns_test = sys.exec("dig openmptcprouter.com | grep 'ANSWER: 0'") local dns_test = sys.exec("dig openmptcprouter.com | grep 'ANSWER: 0'")
@ -695,16 +695,6 @@ function interfaces_status()
end end
end end
--mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or ""
mArray.openmptcprouter["remote_from_lease"] = false
local leases=tools.dhcp_leases()
for _, value in pairs(leases) do
if value["ipaddr"] == mArray.openmptcprouter["remote_addr"] then
mArray.openmptcprouter["remote_from_lease"] = true
mArray.openmptcprouter["remote_hostname"] = value["hostname"]
end
end
if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then
mArray.openmptcprouter["vps_status"] = "DOWN" mArray.openmptcprouter["vps_status"] = "DOWN"
else else
@ -741,6 +731,14 @@ 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_hostname"] = vpsinfo.vps.hostname or "" mArray.openmptcprouter["vps_hostname"] = vpsinfo.vps.hostname or ""
mArray.openmptcprouter["vps_time"] = vpsinfo.vps.time or ""
if vpsinfo.vps.time ~= "" then
if os.time() - vpsinfo.vps.time > 10 then
mArray.openmptcprouter["vps_time_accurate"] = false
else
mArray.openmptcprouter["vps_time_accurate"] = true
end
end
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"] = ""