Skip to content

Commit

Permalink
backport a change from incall_ctrl to fix issue with the first LDU1 a…
Browse files Browse the repository at this point in the history
…fter an HDU being non-standard MFId causing illegal grant demands and/or grants;
  • Loading branch information
gatekeep committed Nov 7, 2024
1 parent dc739c9 commit 0304b98
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/host/p25/packet/Voice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,12 @@ 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()) {
LogMessage(LOG_RF, P25_HDU_STR " ** source RID was 0 with non-standard MFId defaulting source RID, dstId = %u, mfId = $%02X", dstId, lc.getMFId());
srcId = WUID_FNE;
}

// send network grant demand TDU
if (m_p25->m_network != nullptr) {
if (!m_p25->m_dedicatedControl && m_p25->m_convNetGrantDemand) {
Expand Down

0 comments on commit 0304b98

Please sign in to comment.