From d9407cc3b63a71751d3fee36ef071ac884efd185 Mon Sep 17 00:00:00 2001 From: darken Date: Fri, 19 Jun 2026 16:32:06 +0200 Subject: [PATCH] fix(aggregator): name probed decoder address in fr24 reachability errors The fr24 enable/reset gates hardcoded 127.0.0.1:30005 in the decoder_unavailable message while the probe checks AGG_DECODER_ADDR and the piaware path already names it. Use the variable so the message reflects what was actually probed. --- files/usr/local/bin/apl-aggregator | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/usr/local/bin/apl-aggregator b/files/usr/local/bin/apl-aggregator index a688cb2..2e42331 100755 --- a/files/usr/local/bin/apl-aggregator +++ b/files/usr/local/bin/apl-aggregator @@ -1148,7 +1148,7 @@ _enable_fr24() { _valid_geo "$lat" "$lon" "$alt" || { _emit_error rejected "valid latitude, longitude and altitude are required"; exit 2; } fi [[ -z "$key" ]] || _valid_fr24_key "$key" || { _emit_error rejected "invalid sharing key format"; exit 2; } - _decoder_reachable || { _emit_error decoder_unavailable "local decoder 127.0.0.1:30005 is not reachable"; exit 2; } + _decoder_reachable || { _emit_error decoder_unavailable "local decoder ${AGG_DECODER_ADDR} is not reachable"; exit 2; } # Pinned vendor URL + checksum from the (trusted) descriptor, captured in a # subshell so descriptor sourcing cannot clobber locals or write to stdout. @@ -1236,7 +1236,7 @@ _fr24_validate_sync() { _valid_geo "$lat" "$lon" "$alt" || { _emit_error rejected "valid latitude, longitude and altitude are required"; exit 2; } fi [[ -z "$key" ]] || _valid_fr24_key "$key" || { _emit_error rejected "invalid sharing key format"; exit 2; } - _decoder_reachable || { _emit_error decoder_unavailable "local decoder 127.0.0.1:30005 is not reachable"; exit 2; } + _decoder_reachable || { _emit_error decoder_unavailable "local decoder ${AGG_DECODER_ADDR} is not reachable"; exit 2; } } # --- piaware (pinned-deb) --------------------------------------------------