Improve wrapper script

diff --git a/lagdetect.sh b/lagdetect.sh
index 45224c36a45cf05cce047dd28ee4e5c63f84949f..268b24f2c86c0ccddd6f846ca9df4cf05887f667 100755 (executable)
--- a/lagdetect.sh
+++ b/lagdetect.sh
@@ -14,18 +14,27 @@ PING_INTERVAL=500
 # DO NOT EDIT BELOW #
 #####################
 
-set -u
-for t in traceroute fping
+for p in traceroute fping awk
 do
-type "$t" || exit 1
+  type "${p}" || { printf 'FATAL: Required program "%s" not installed.\n' "${p}" >&2; exit 1; }
 done
 
-_def_gw_v4=$(traceroute -n -m 1 1.1.1.1 | awk '{if("1" == $1){print $2}}')
+if [ x"${PING_GW_IPV6}" = xyes ]
+then
+  PING_PEERS="$(traceroute -6 -n -m 2001:4860:4860::8888 | awk '{if("1" == $1){print $2}}') ${PING_PEERS}"
+fi
+
+if [ x"${PING_GW_IPV4}" = xyes ]
+then
+  PING_PEERS="$(traceroute -4 -n -m 1 1.1.1.1 | awk '{if("1" == $1){print $2}}') ${PING_PEERS}"
+fi
+
+set -u
 
-fping --loop --retry=1 --size=1280 --period="${PING_INTERVAL}" --random "${_def_gw_v4}" ${PING_PEERS} 2>/dev/null \
+fping --loop --retry=1 --size=1280 --period="${PING_INTERVAL}" --random ${PING_PEERS} 2>/dev/null \
 | awk \
-    -v THRESHOLD="${THRESHOLD}" \
-    -v PINGSLOTS="${PING_SLOTS_PER_PEER}" \
-    -v FUDGE="${FUDGE_MS}" \
-    -v PING_PEERS="${_def_gw_v4} ${PING_PEERS}" \
-    -f __lagdetect.awk
+  -v THRESHOLD="${THRESHOLD}" \
+  -v PINGSLOTS="${PING_SLOTS_PER_PEER}" \
+  -v FUDGE="${FUDGE_MS}" \
+  -v PING_PEERS="${PING_PEERS}" \
+  -f __lagdetect.awk