Skip to content

Update tcpping to 2.7 #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thespad merged 1 commit into from
Jun 5, 2025
Merged

Update tcpping to 2.7 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."}
Expand Down
15 changes: 4 additions & 11 deletions root/defaults/tcpping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
#
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down