From 1b6735549fcb7e0c2cdbc40813be1779c2062b4e Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Mon, 13 May 2024 10:23:58 +0300
Subject: [PATCH] blockcheck: support more nslookup and ping variants

---
 blockcheck.sh | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/blockcheck.sh b/blockcheck.sh
index 3252558..6d9da2f 100755
--- a/blockcheck.sh
+++ b/blockcheck.sh
@@ -1347,11 +1347,27 @@ ask_params()
 
 
 
+ping_with_fix()
+{
+	local ret
+	$PING $2 $1 >/dev/null 2>/dev/null
+	ret=$?
+	# can be because of unsupported -4 option
+	if [ "$ret" = 2 -o "$ret" = 64 ]; then
+		ping $2 $1 >/dev/null
+	else
+		return $ret
+	fi
+}
+
 pingtest()
 {
 	# $1 - ip version : 4 or 6
 	# $2 - domain or ip
+
 	# ping command can vary a lot. some implementations have -4/-6 options. others don.t
+	# WARNING ! macos ping6 command does not have timeout option. ping6 will fail
+
 	local PING=ping ret
 	if [ "$1" = 6 ]; then
 		if exists ping6; then
@@ -1371,6 +1387,10 @@ pingtest()
 		fi
 	fi
 	case "$UNAME" in
+		Darwin)
+			$PING -c 1 -t 1 $2 >/dev/null 2>/dev/null
+			# WARNING ! macos ping6 command does not have timeout option. ping6 will fail. but without timeout is not an option.
+			;;
 		OpenBSD)
 			$PING -c 1 -w 1 $2 >/dev/null
 			;;
@@ -1379,19 +1399,11 @@ pingtest()
 				# cygwin does not have own ping by default. use windows PING.
 				$PING -n 1 -w 1000 $2 >/dev/null
 			else
-				# they have installed cygwin ping
-				$PING -c 1 -W 1 $2 >/dev/null
+				ping_with_fix $2 '-c 1 -w 1'
 			fi
 			;;
 		*)
-			$PING -c 1 -W 1 $2 >/dev/null 2>/dev/null
-			ret=$?
-			# can be because of unsupported -4 option
-			if [ "$ret" = 2 ]; then
-				ping -c 1 -W 1 $2 >/dev/null
-			else
-				return $ret
-			fi
+			ping_with_fix $2 '-c 1 -W 1'
 			;;
 	esac
 }