Update tcpping to 2.7

This commit is contained in:
thespad
2025-06-05 17:32:30 +01:00
parent 178fc39c34
commit 273f9f409f
3 changed files with 6 additions and 11 deletions

View File

@@ -296,6 +296,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **05.06.25:** - Update TCPPing to 2.7 to fix traceroute incompatibility.
* **03.06.25:** - Rebase to Alpine 3.22. Update TCPPing. Add curl probe.
* **27.07.24:** - Add additional dependency packages for InfluxDB.
* **25.06.24:** - Rebase to Alpine 3.20.

View File

@@ -83,6 +83,7 @@ init_diagram: |
"smokeping:latest" <- Base Images
# changelog
changelogs:
- {date: "05.06.25:", desc: "Update TCPPing to 2.7 to fix traceroute incompatibility."}
- {date: "03.06.25:", desc: "Rebase to Alpine 3.22. Update TCPPing. Add curl probe."}
- {date: "27.07.24:", desc: "Add additional dependency packages for InfluxDB."}
- {date: "25.06.24:", desc: "Rebase to Alpine 3.20."}

View File

@@ -6,7 +6,7 @@
#
# uses recent versions of traceroute supporting TCP sessions
#
# (c) 2002-2024 Richard van den Berg <richard@vdberg.org>, Orsiris de Jong <ozy@netpower.fr>
# (c) 2002-2025 Richard van den Berg <richard@vdberg.org>, Orsiris de Jong <ozy@netpower.fr>
# under the GPL http://www.gnu.org/copyleft/gpl.html
#
#
@@ -56,8 +56,9 @@
# Added fallback support for tcptraceroute, courtesy of Damien Mascord <tusker@tusker.org>
# 2024/10/24 v2.6 Added support for optional /etc/tcpping.conf file
# Various shellcheck fixes
# 2025/06/05 v2.7 Fix output parsing on some traceroute implementations, Thanks to Luke Hamburg <github.com/luckman212>
ver="v2.6-dev"
ver="v2.7"
format="%Y%m%d%H%M%S"
d="no"
c="no"
@@ -214,13 +215,9 @@ _testSite() {
local args=
local i=1
local traceroute_arg_n=false
for givenArgs in "${@}"; do
if [ $i -gt 3 ]; then
args="$args $givenArgs"
if [ "${givenArgs}" = "-n" ]; then
traceroute_arg_n=true
fi
fi
i=`expr $i + 1`
done
@@ -286,11 +283,7 @@ _testSite() {
else
rtt=`echo "${traceRoute}" | awk '{print $4}'`
fi
if [ "${traceroute_arg_n}" = true ]; then
rtt=`echo "${traceRoute}" | awk '{print $3}'`
else
rtt=`echo "${traceRoute}" | awk '{print $4}'`
fi
rtt=`echo "${traceRoute}" | awk '{print $(NF-1)}'`
not=`echo "${rtt}" | tr -d ".0123456789"`
[ "${d}" = "yes" ] && echo "$nowd"