From ce69d7893299c7f670752c0f0ee3c42481316d91 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 12 Feb 2022 18:13:52 -0500 Subject: [PATCH] allow affiliation to TG0 during location registration too; --- p25/TrunkPacket.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/p25/TrunkPacket.cpp b/p25/TrunkPacket.cpp index 5b5ad56c..cd31abfb 100644 --- a/p25/TrunkPacket.cpp +++ b/p25/TrunkPacket.cpp @@ -2294,10 +2294,15 @@ bool TrunkPacket::writeRF_TSDU_Loc_Reg_Rsp(uint32_t srcId, uint32_t dstId) // validate the talkgroup ID if (m_rfTSBK.getGroup()) { - if (!acl::AccessControl::validateTGId(dstId)) { - LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_OSP_LOC_REG_RSP (Location Registration Response) denial, TGID rejection, dstId = %u", dstId); - ::ActivityLog("P25", true, "location registration request from %u to %s %u denied", srcId, "TG ", dstId); - m_rfTSBK.setResponse(P25_RSP_DENY); + if (dstId == 0U) { + LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_OSP_LOC_REG_RSP (Location Registration Response), TGID 0, dstId = %u", dstId); + } + else { + if (!acl::AccessControl::validateTGId(dstId)) { + LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_OSP_LOC_REG_RSP (Location Registration Response) denial, TGID rejection, dstId = %u", dstId); + ::ActivityLog("P25", true, "location registration request from %u to %s %u denied", srcId, "TG ", dstId); + m_rfTSBK.setResponse(P25_RSP_DENY); + } } }