allen/kit-busrouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent double-ping fallback corrupting WAN metrics

Browse Source 
- sudo ping returns exit 1 on any packet loss, which triggered the
  || fallback to direct ping, causing duplicate output concatenation
- Now check exit code explicitly: only fall back on exit >= 2 (real error)
- Fixes loss_pct showing 100100 instead of 100 on failed WANs

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
kitadmin
2026-07-23 02:10:35 +00:00
parent 91373df27d
commit 58ac96fd3c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package/kit-busrouter/files/usr/lib/busrouter/telemetry-synology.sh
+9 -2
View File
@@ -199,11 +199,18 @@ _eyeride_signal() {
# Ping an interface to get latency and loss. # Ping an interface to get latency and loss.
# On Synology SRM: ping requires root. When running from cron (as root), it works. # On Synology SRM: ping requires root. When running from cron (as root), it works.
# When run manually as non-root, gracefully returns null. # When run manually as non-root, gracefully returns null.
# NOTE: ping returns exit 0 on success, 1 on any packet loss, 2 on error.
# We use sudo first; if sudo ping exits 2 (real error), fall back to direct ping.
# Exit 1 (packet loss) is a valid result — do NOT fall back on it.
# Usage: _ping_iface <iface> → "lat_ms loss_pct" # Usage: _ping_iface <iface> → "lat_ms loss_pct"
_ping_iface() { _ping_iface() {
_iface="$1" _iface="$1"
# Try sudo ping (for Synology where ping needs root), fall back to direct ping # Try sudo ping first. Only fall back to direct ping if sudo fails (exit 2+).
_out=$(sudo ping -I "$_iface" -c 3 -W 3 "$PING_TARGET" 2>/dev/null || ping -I "$_iface" -c 3 -W 3 "$PING_TARGET" 2>/dev/null) _out=$(sudo ping -I "$_iface" -c 3 -W 3 "$PING_TARGET" 2>/dev/null)
_rc=$?
if [ $_rc -ge 2 ]; then
_out=$(ping -I "$_iface" -c 3 -W 3 "$PING_TARGET" 2>/dev/null)
fi
if [ -z "$_out" ]; then if [ -z "$_out" ]; then
echo "null null" echo "null null"
return return