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

No check using DNS if DNS not working

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-01-03 21:09:45 +01:00
parent 7e6b171d01
commit e28dd28dde
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -691,7 +691,7 @@ function interfaces_status()
tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or "" tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or ""
if tracker_ip ~= "" then if tracker_ip ~= "" then
local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") local tracker_port = uci:get("shadowsocks-libev","tracker","local_port")
if uci:get("openmptcprouter","settings","external_check") ~= "0" then if mArray.openmptcprouter["external_check"] ~= false then
mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website)) mArray.openmptcprouter["ss_addr"] = ut.trim(sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m " .. timeout .. " " .. check_ipv4_website))
--mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com")
end end
@ -1040,26 +1040,32 @@ function interfaces_status()
-- Test if multipath can work on the connection -- Test if multipath can work on the connection
local multipath_available_state = uci:get("openmptcprouter",interface,"mptcp_status") or "" local multipath_available_state = uci:get("openmptcprouter",interface,"mptcp_status") or ""
if multipath_available_state == "" then if multipath_available_state == "" then
if mArray.openmptcprouter["external_check"] ~= false then
--if mArray.openmptcprouter["service_addr"] ~= "" then --if mArray.openmptcprouter["service_addr"] ~= "" then
-- multipath_available_state = ut.trim(sys.exec("omr-tracebox-mptcp " .. mArray.openmptcprouter["service_addr"] .. " " .. ifname .. " | grep 'MPTCP disabled'")) -- multipath_available_state = ut.trim(sys.exec("omr-tracebox-mptcp " .. mArray.openmptcprouter["service_addr"] .. " " .. ifname .. " | grep 'MPTCP disabled'"))
--else --else
multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'")) multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
--end --end
end
else else
multipath_available_state = ut.trim(sys.exec("echo '" .. multipath_available_state .. "' | grep 'MPTCP disabled'")) multipath_available_state = ut.trim(sys.exec("echo '" .. multipath_available_state .. "' | grep 'MPTCP disabled'"))
end end
if multipath_available_state == "" then if multipath_available_state == "" then
multipath_available = "OK" multipath_available = "OK"
else else
multipath_available_state_wan = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'")) if mArray.openmptcprouter["external_check"] ~= false then
if multipath_available_state_wan == "" then multipath_available_state_wan = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
multipath_available = "OK" if multipath_available_state_wan == "" then
if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then multipath_available = "OK"
mArray.openmptcprouter["server_mptcp"] = "disabled" if mArray.openmptcprouter["service_addr"] ~= "" and mArray.openmptcprouter["service_addr"] ~= "127.0.0.1" then
mArray.openmptcprouter["server_mptcp"] = "disabled"
end
else
multipath_available = "ERROR"
connectivity = "WARNING"
end end
else else
multipath_available = "ERROR" multipath_available = "NO CHECK"
connectivity = "WARNING"
end end
end end
else else
@ -1094,12 +1100,12 @@ function interfaces_status()
local whois = "" local whois = ""
if ifname ~= nil and ifname:match("^tun.*") and interface:match("^ovpn.*") then if ifname ~= nil and ifname:match("^tun.*") and interface:match("^ovpn.*") then
publicIP = uci:get("openmptcprouter",interface:sub(5),"publicip") or "" publicIP = uci:get("openmptcprouter",interface:sub(5),"publicip") or ""
if ifname ~= nil and publicIP == "" and uci:get("openmptcprouter","settings","external_check") ~= "0" then if ifname ~= nil and publicIP == "" and mArray.openmptcprouter["external_check"] ~= false then
publicIP = ut.trim(sys.exec("omr-ip-intf " .. get_device(interface:sub(5)))) publicIP = ut.trim(sys.exec("omr-ip-intf " .. get_device(interface:sub(5))))
end end
else else
publicIP = uci:get("openmptcprouter",interface,"publicip") or "" publicIP = uci:get("openmptcprouter",interface,"publicip") or ""
if ifname ~= nil and publicIP == "" and uci:get("openmptcprouter","settings","external_check") ~= "0" then if ifname ~= nil and publicIP == "" and mArray.openmptcprouter["external_check"] ~= false then
publicIP = ut.trim(sys.exec("omr-ip-intf " .. ifname)) publicIP = ut.trim(sys.exec("omr-ip-intf " .. ifname))
end end
end end
@ -1107,7 +1113,7 @@ function interfaces_status()
whois = "" whois = ""
if publicIP ~= "" then if publicIP ~= "" then
whois = uci:get("openmptcprouter",interface,"asn") or "" whois = uci:get("openmptcprouter",interface,"asn") or ""
if whois == "" and uci:get("openmptcprouter","settings","external_check") ~= "0" and mArray.openmptcprouter["dns"] == true then if whois == "" and mArray.openmptcprouter["external_check"] ~= false and mArray.openmptcprouter["dns"] == true then
--whois = ut.trim(sys.exec("whois " .. publicIP .. " | grep -i 'netname' | awk '{print $2}'")) --whois = ut.trim(sys.exec("whois " .. publicIP .. " | grep -i 'netname' | awk '{print $2}'"))
whois = ut.trim(sys.exec("wget -4 -qO- -T 1 'http://api.iptoasn.com/v1/as/ip/" .. publicIP .. "' | jsonfilter -q -e '@.as_description'")) whois = ut.trim(sys.exec("wget -4 -qO- -T 1 'http://api.iptoasn.com/v1/as/ip/" .. publicIP .. "' | jsonfilter -q -e '@.as_description'"))
end end