|
|
|
@ -2119,10 +2119,15 @@ bool TrunkPacket::writeRF_TSDU_Grp_Aff_Rsp(uint32_t srcId, uint32_t dstId)
|
|
|
|
|
|
|
|
|
|
|
|
// validate the talkgroup ID
|
|
|
|
// validate the talkgroup ID
|
|
|
|
if (m_rfTSBK.getGroup()) {
|
|
|
|
if (m_rfTSBK.getGroup()) {
|
|
|
|
if (!acl::AccessControl::validateTGId(dstId)) {
|
|
|
|
if (dstId == 0U) {
|
|
|
|
LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_IOSP_GRP_AFF (Group Affiliation Response) denial, TGID rejection, dstId = %u", dstId);
|
|
|
|
LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_IOSP_GRP_AFF (Group Affiliation Response), TGID 0, dstId = %u", dstId);
|
|
|
|
::ActivityLog("P25", true, "group affiliation request from %u to %s %u denied", srcId, "TG ", dstId);
|
|
|
|
}
|
|
|
|
m_rfTSBK.setResponse(P25_RSP_DENY);
|
|
|
|
else {
|
|
|
|
|
|
|
|
if (!acl::AccessControl::validateTGId(dstId)) {
|
|
|
|
|
|
|
|
LogWarning(LOG_RF, P25_TSDU_STR ", TSBK_IOSP_GRP_AFF (Group Affiliation Response) denial, TGID rejection, dstId = %u", dstId);
|
|
|
|
|
|
|
|
::ActivityLog("P25", true, "group affiliation request from %u to %s %u denied", srcId, "TG ", dstId);
|
|
|
|
|
|
|
|
m_rfTSBK.setResponse(P25_RSP_DENY);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|