From cb309fdb0f3eb4a4c32a7e3f9f1a4910b60e402c Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 25 Jan 2025 17:28:54 -0500 Subject: [PATCH] reasonably this message shouldn't even appear if we don't have the channel granted; --- src/host/p25/packet/ControlSignaling.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/host/p25/packet/ControlSignaling.cpp b/src/host/p25/packet/ControlSignaling.cpp index 8f3c45ab..e377fbda 100644 --- a/src/host/p25/packet/ControlSignaling.cpp +++ b/src/host/p25/packet/ControlSignaling.cpp @@ -787,15 +787,15 @@ bool ControlSignaling::processNetwork(uint8_t* data, uint32_t len, lc::LC& contr case LCO::CALL_TERM: { if (m_p25->m_dedicatedControl) { - uint32_t chNo = tsbk->getGrpVchNo(); - - if (m_verbose) { - LogMessage(LOG_NET, P25_TSDU_STR ", %s, chNo = %u, srcId = %u, dstId = %u", - tsbk->toString().c_str(), chNo, srcId, dstId); - } - // is the specified channel granted? if (/*m_p25->m_affiliations.isChBusy(chNo) &&*/ m_p25->m_affiliations.isGranted(dstId)) { + uint32_t chNo = tsbk->getGrpVchNo(); + + if (m_verbose) { + LogMessage(LOG_NET, P25_TSDU_STR ", %s, chNo = %u, srcId = %u, dstId = %u", + tsbk->toString().c_str(), chNo, srcId, dstId); + } + m_p25->m_affiliations.releaseGrant(dstId, false); } }