WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change CheckConnectivity3rdPartyHosts to allow external IPs

This commit is contained in:
Orsiris de Jong 2021-05-18 20:36:42 +02:00 committed by GitHub
parent 96c26e2791
commit a36fd05069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/ofunctions.sh
View File

@ -1928,7 +1928,13 @@ function CheckConnectivityRemoteHost {
} }
function CheckConnectivity3rdPartyHosts { function CheckConnectivity3rdPartyHosts {
__CheckArguments 0 $# "$@" #__WITH_PARANOIA_DEBUG # Check if at least one host is reachable in order to diag internet
# third_party_hosts_ips=('1.1.1.1' '8.8.8.8' 'kernel.org' 'google.com')
# CheckConnectivity3rdPartyHosts $third_party_hosts_ips
__CheckArguments 0-1 $# "$@" #__WITH_PARANOIA_DEBUG
local remote_3rd_party_hosts="${1}" # Optional list of hosts to check
local remote3rdPartySuccess local remote3rdPartySuccess
local retval local retval
@ -1936,7 +1942,10 @@ function CheckConnectivity3rdPartyHosts {
if [ "$_PARANOIA_DEBUG" != true ]; then # Do not loose time in paranoia debug #__WITH_PARANOIA_DEBUG if [ "$_PARANOIA_DEBUG" != true ]; then # Do not loose time in paranoia debug #__WITH_PARANOIA_DEBUG
if [ "$REMOTE_3RD_PARTY_HOSTS" != "" ]; then if [ "$remote_3rd_party_hosts" == "" ]; then
remote_3rd_party_hosts="$REMOTE_3RD_PARTY_HOSTS
fi
if [ "$remote_3rd_party_hosts" != "" ]; then
remote3rdPartySuccess=false remote3rdPartySuccess=false
for i in $REMOTE_3RD_PARTY_HOSTS for i in $REMOTE_3RD_PARTY_HOSTS
do do
@ -1947,6 +1956,7 @@ function CheckConnectivity3rdPartyHosts {
Logger "Cannot ping 3rd party host [$i]. Return code [$retval]." "NOTICE" Logger "Cannot ping 3rd party host [$i]. Return code [$retval]." "NOTICE"
else else
remote3rdPartySuccess=true remote3rdPartySuccess=true
break
fi fi
done done