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

@@ -20,6 +20,7 @@
#include <vector>
#include <ctime>
std::vector<unsigned int> DMRAccessControl::m_dstBlackListSlot1RF;
std::vector<unsigned int> DMRAccessControl::m_dstBlackListSlot2RF;
std::vector<unsigned int> DMRAccessControl::m_dstWhiteListSlot1RF;
@@ -196,7 +197,7 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id,
}
}
unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network)
unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC)
{
if (slot == 1 && m_TGRewriteSlot1 == false)
@@ -204,6 +205,9 @@ unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid,
if (slot == 2 && m_TGRewriteSlot2 == false)
return 0;
if (dmrLC->getFLCO() != FLCO_GROUP)
return 0;
std::time_t currenttime = std::time(nullptr);