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

Fix server usage when IPv4 and IPv6 set

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-05-13 20:23:32 +02:00
parent 5eb157e2a0
commit 2d5cef4623
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,6 @@ _check_master() {
local count=0 local count=0
local countips=0 local countips=0
local changes="0" local changes="0"
local oneserverup="0"
config_get master $1 master config_get master $1 master
config_get ip $1 ip config_get ip $1 ip
config_get port $1 port "65500" config_get port $1 port "65500"
@ -143,6 +142,7 @@ _check_master() {
[ "$master" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && { [ "$master" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
check_ip() { check_ip() {
local ipd=$1 local ipd=$1
server_ping=false
#[ -n "$serverip" ] && [ "$server_ping" = true ] && return #[ -n "$serverip" ] && [ "$server_ping" = true ] && return
ipresolve="$(resolveip -4 $ipd | head -n 1)" ipresolve="$(resolveip -4 $ipd | head -n 1)"
if [ -n "$ipresolve" ]; then if [ -n "$ipresolve" ]; then
@ -312,7 +312,6 @@ _check_backup() {
local count=0 local count=0
local countips=0 local countips=0
local changes="0" local changes="0"
local oneserverup="0"
config_get backup $1 backup config_get backup $1 backup
config_get ip $1 ip config_get ip $1 ip
config_get port $1 port config_get port $1 port
@ -321,7 +320,8 @@ _check_backup() {
[ "$backup" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && { [ "$backup" = "1" ] && [ -n "$ip" ] && [ "$disabled" != "1" ] && {
check_ip() { check_ip() {
local ipd=$1 local ipd=$1
[ -n "$serverip" ] && [ "$server_ping" = true ] && return server_ping=false
#[ -n "$serverip" ] && [ "$server_ping" = true ] && return
ipresolve="$(resolveip -4 $ipd | head -n 1)" ipresolve="$(resolveip -4 $ipd | head -n 1)"
if [ -n "$ipresolve" ]; then if [ -n "$ipresolve" ]; then
serverip="$ipresolve" serverip="$ipresolve"
@ -498,9 +498,10 @@ retry=${OMR_TRACKER_TRIES:-4}
waittest=${OMR_TRACKER_WAIT_TEST:-0} waittest=${OMR_TRACKER_WAIT_TEST:-0}
while true; do while true; do
server_ping=false server_ping=false
oneserverup="0"
config_load openmptcprouter config_load openmptcprouter
config_foreach _check_master server config_foreach _check_master server
[ "$server_ping" = false ] && { [ "$oneserverup" = "0" ] && {
config_load openmptcprouter config_load openmptcprouter
config_foreach _check_backup server config_foreach _check_backup server
} }