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

8
omr-tracker/files/bin/omr-tracker-server
View file

@ -166,11 +166,11 @@ _check_master() {
local ipd=$1
server_ping=false
#[ -n "$serverip" ] && [ "$server_ping" = true ] && return
ipresolve="$(resolveip -4 $ipd | head -n 1)"
ipresolve="$(resolveip -t 5 -4 $ipd | head -n 1)"
if [ -n "$ipresolve" ]; then
serverip="$ipresolve"
else
ip6resolve="$(resolveip -6 $ipd | head -n 1)"
ip6resolve="$(resolveip -t 5 -6 $ipd | head -n 1)"
[ -n "$ip6resolve" ] && serverip="$ip6resolve"
fi
[ -z "$serverip" ] && return
@ -374,11 +374,11 @@ _check_backup() {
local ipd=$1
server_ping=false
#[ -n "$serverip" ] && [ "$server_ping" = true ] && return
ipresolve="$(resolveip -4 $ipd | head -n 1)"
ipresolve="$(resolveip -t 5 -4 $ipd | head -n 1)"
if [ -n "$ipresolve" ]; then
serverip="$ipresolve"
else
ip6resolve="$(resolveip -6 $ipd | head -n 1)"
ip6resolve="$(resolveip -t 5 -6 $ipd | head -n 1)"
[ -n "$ip6resolve" ] && serverip="$ip6resolve"
fi
[ -z "$serverip" ] && return