don't bother with last destination ID checking during grant processing if in dedicated CC mode [this may turn out to be a dirty hack];

3.5-maint
Bryan Biedenkapp 2 years ago
parent 19190ce69d
commit 102d6a5674

@ -2131,6 +2131,8 @@ bool ControlSignaling::writeRF_TSDU_Grant(uint32_t srcId, uint32_t dstId, uint8_
return false;
}
// only do the last destination ID checking if we're operating in non-dedicated mode (e.g. DVRS)
if (!m_p25->m_dedicatedControl) {
if (m_p25->m_netState != RS_NET_IDLE && dstId == m_p25->m_netLastDstId) {
if (!net) {
LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_IOSP_GRP_VCH (Group Voice Channel Request) denied, traffic in progress, dstId = %u", dstId);
@ -2157,6 +2159,7 @@ bool ControlSignaling::writeRF_TSDU_Grant(uint32_t srcId, uint32_t dstId, uint8_
return false;
}
}
}
if (!m_p25->m_affiliations.isGranted(dstId)) {
if (!m_p25->m_affiliations.isRFChAvailable()) {

Loading…
Cancel
Save

Powered by TurnKey Linux.