From d39b98c751606f6975cacaa50b3bebb96b06b9c0 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Thu, 12 Feb 2026 15:12:54 -0500 Subject: [PATCH] lets make sure RID0 is never used, treat as WUID_FNE instead; --- src/host/p25/packet/Voice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/host/p25/packet/Voice.cpp b/src/host/p25/packet/Voice.cpp index 432c8d20..e0f22aa0 100644 --- a/src/host/p25/packet/Voice.cpp +++ b/src/host/p25/packet/Voice.cpp @@ -348,9 +348,9 @@ bool Voice::process(uint8_t* data, uint32_t len) } } - // bryanb: due to moronic reasons -- if this case happens, default the RID to something sane - if (srcId == 0U && !lc.isStandardMFId()) { - LogInfoEx(LOG_RF, P25_HDU_STR " ** source RID was 0 with non-standard MFId defaulting source RID, dstId = %u, mfId = $%02X", dstId, lc.getMFId()); + // bryanb: due to moronic reasons (mostly our favorite neighborhood OEM...) -- if this case happens, default the RID to something sane + if (srcId == 0U) { + LogInfoEx(LOG_RF, P25_HDU_STR " ** source RID was 0, defaulting source RID, dstId = %u, mfId = $%02X", dstId, lc.getMFId()); srcId = WUID_FNE; }