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

Add a timeout on all resolveip requests

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-08-27 09:33:23 +02:00
parent f2546261fe
commit bf8cc3b4db
15 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter
View file

@ -902,7 +902,7 @@ function interfaces_status()
local master = uci:get("openmptcprouter",s[".name"],"master") or "1"
local current = uci:get("openmptcprouter",s[".name"],"current") or "0"
for key, value in pairs(serverips) do
serverip = sys.exec('resolveip ' .. value .. ' | head -n 1 | tr -d "\n"')
serverip = sys.exec('resolveip -t 1 ' .. value .. ' | head -n 1 | tr -d "\n"')
if serverip ~= "" and (current == "1" or mArray.openmptcprouter["wan_addr"] == serverip or mArray.openmptcprouter["wan_addr6"] == serverip) and mArray.openmptcprouter["vps_admin"] == false then
mArray.openmptcprouter["vps_omr_version"] = uci:get("openmptcprouter", s[".name"], "omr_version") or ""
mArray.openmptcprouter["vps_kernel"] = uci:get("openmptcprouter",s[".name"],"kernel") or ""
@ -1511,9 +1511,9 @@ function interfaces_status()
serverip = mArray.openmptcprouter["wan_addr"]
end
if gateway ~= "" then
serverip = sys.exec('resolveip -4 ' .. value .. ' | head -n 1')
serverip = sys.exec('resolveip -t 1 -4 ' .. value .. ' | head -n 1')
elseif gateway6 ~= "" then
serverip = sys.exec('resolveip -6 ' .. value .. ' | head -n 1')
serverip = sys.exec('resolveip -t 1 -6 ' .. value .. ' | head -n 1')
end
if serverip == "" then
serverip = value