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

Set dig timeout for DNS test and change multipath test

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2020-06-26 14:55:59 +02:00
parent fc0bb15373
commit 5de56cb576
1 changed files with 5 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -657,7 +657,8 @@ function interfaces_status()
mArray.openmptcprouter["omr_time"] = os.time() 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 timeout = uci:get("openmptcprouter","settings","status_getip_timeout") or "2"
local dns_test = sys.exec("dig +timeout=" .. timeout .. " openmptcprouter.com | grep 'ANSWER: 0'")
if dns_test == "" then if dns_test == "" then
mArray.openmptcprouter["dns"] = true mArray.openmptcprouter["dns"] = true
end end
@ -679,7 +680,6 @@ function interfaces_status()
--mArray.openmptcprouter["wan_addr"] = uci:get("openmptcprouter","omr","public_detected_ipv4") or "" --mArray.openmptcprouter["wan_addr"] = uci:get("openmptcprouter","omr","public_detected_ipv4") or ""
if uci:get("openmptcprouter","settings","external_check") ~= "0" and mArray.openmptcprouter["dns"] == true then if uci:get("openmptcprouter","settings","external_check") ~= "0" and mArray.openmptcprouter["dns"] == true then
timeout = uci:get("openmptcprouter","settings","status_getip_timeout") or "2"
mArray.openmptcprouter["wan_addr"] = ut.trim(sys.exec("wget -4 -qO- -T " .. timeout .. " " .. check_ipv4_website)) mArray.openmptcprouter["wan_addr"] = ut.trim(sys.exec("wget -4 -qO- -T " .. timeout .. " " .. check_ipv4_website))
if mArray.openmptcprouter["wan_addr"] == "" then if mArray.openmptcprouter["wan_addr"] == "" then
mArray.openmptcprouter["wan_addr"] = ut.trim(sys.exec("dig TXT +timeout=" .. timeout .. " +short o-o.myaddr.l.google.com @ns1.google.com | awk -F'\"' '{print $2}'")) mArray.openmptcprouter["wan_addr"] = ut.trim(sys.exec("dig TXT +timeout=" .. timeout .. " +short o-o.myaddr.l.google.com @ns1.google.com | awk -F'\"' '{print $2}'"))
@ -1123,35 +1123,13 @@ function interfaces_status()
local multipath_available_state = "" local multipath_available_state = ""
if connectivity ~= "ERROR" and mArray.openmptcprouter["dns"] == true and ifname ~= nil and ifname ~= "" and gateway ~= "" and gw_ping == "UP" then if connectivity ~= "ERROR" and mArray.openmptcprouter["dns"] == true and ifname ~= nil and ifname ~= "" and gateway ~= "" and gw_ping == "UP" then
-- 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 mArray.openmptcprouter["external_check"] ~= false 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'"))
--else
multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
--end
end
-- else
-- multipath_available_state = ut.trim(sys.exec("echo '" .. multipath_available_state .. "' | grep 'MPTCP disabled'"))
-- end
if multipath_available_state == "" then if multipath_available_state == "" then
multipath_available = "NO CHECK"
elseif multipath_available_state == "MPTCP enabled" then
multipath_available = "OK" multipath_available = "OK"
else else
-- if mArray.openmptcprouter["external_check"] ~= false then
-- multipath_available_state_wan = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'"))
-- if multipath_available_state_wan == "" then
-- multipath_available = "OK"
-- 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" multipath_available = "ERROR"
-- connectivity = "WARNING"
-- end
-- else
-- multipath_available = "NO CHECK"
-- end
end end
else else
multipath_available = "NO CHECK" multipath_available = "NO CHECK"