Added check to exclude private calls from TG rewrite. (FLCO_GROUP)

This commit is contained in:
Simon
2016-09-17 11:07:23 +01:00
parent 79e24fe5ef
commit aa3e592ebb
3 changed files with 11 additions and 7 deletions

View File

@@ -159,7 +159,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
return;
}
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false,lc);
if (rw_id) {
lc->setDstId(rw_id);
@@ -492,8 +492,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len)
delete lc;
return;
}
// Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false);
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false,lc);
if (rw_id) {
lc->setDstId(rw_id);
@@ -778,7 +777,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return;
// Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, sid,m_slotNo, true);
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, sid,m_slotNo, true,m_netLC);
if (rw_id) {
m_netLC->setDstId(rw_id);
@@ -848,7 +847,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
return;
// Test dst rewrite
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,true);
unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,true, m_netLC);
if (rw_id) {
m_netLC->setDstId(rw_id);