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

Disable check using domains when DNS is down

Browse source
This commit is contained in:
Ycarus 2018-06-18 23:58:02 +02:00
parent f6efdc51c9
commit eb3f0cc41c
1 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -309,17 +309,6 @@ function interfaces_status()
mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "proxy", "server") or "0.0.0.0" mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "proxy", "server") or "0.0.0.0"
mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr") mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr")
-- shadowsocksaddr
local tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or ""
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 5 http://ip.openmptcprouter.com")
else
mArray.openmptcprouter["ss_addr"] = ""
end
-- wanaddr
mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com")
-- 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'")
@ -327,6 +316,22 @@ function interfaces_status()
mArray.openmptcprouter["dns"] = true mArray.openmptcprouter["dns"] = true
end end
if mArray.openmptcprouter["dns"] == true then
-- shadowsocksaddr
local tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or ""
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 5 http://ip.openmptcprouter.com")
else
mArray.openmptcprouter["ss_addr"] = ""
end
-- wanaddr
mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com")
else
mArray.openmptcprouter["ss_addr"] = ""
mArray.openmptcprouter["wan_addr"] = ""
end
mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or "" mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or ""
mArray.openmptcprouter["remote_from_lease"] = false mArray.openmptcprouter["remote_from_lease"] = false
local leases=tools.dhcp_leases() local leases=tools.dhcp_leases()
@ -452,13 +457,17 @@ function interfaces_status()
connectivity = 'ERROR' connectivity = 'ERROR'
end end
-- Test if multipath can work on the connection if mArray.openmptcprouter["dns"] == true then
local multipath_available -- Test if multipath can work on the connection
local multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'")) local multipath_available
if multipath_available_state == "" then local multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
multipath_available = 'OK' if multipath_available_state == "" then
multipath_available = 'OK'
else
multipath_available = 'ERROR'
end
else else
multipath_available = 'ERROR' multipath_available = 'NO CHECK'
end end