Talkgroup rewrite now working

This commit is contained in:
Simon
2016-09-15 14:19:00 +01:00
parent 105d18594a
commit 21691b046b
3 changed files with 44 additions and 38 deletions

View File

@@ -22,9 +22,10 @@ class DMRAccessControl {
public:
static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network);
static void init(const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id);
static void init(const std::vector<unsigned int>& DstIdBlacklistSlot1RF, const std::vector<unsigned int>& DstIdWhitelistSlot1RF, const std::vector<unsigned int>& DstIdBlacklistSlot2RF, const std::vector<unsigned int>& DstIdWhitelistSlot2RF, const std::vector<unsigned int>& DstIdBlacklistSlot1NET, const std::vector<unsigned int>& DstIdWhitelistSlot1NET, const std::vector<unsigned int>& DstIdBlacklistSlot2NET, const std::vector<unsigned int>& DstIdWhitelistSlot2NET, const std::vector<unsigned int>& SrcIdBlacklist, bool selfOnly, const std::vector<unsigned int>& prefixes,unsigned int id,unsigned int callHang);
static unsigned int DstIdRewrite(unsigned int id, bool network);
static unsigned int DstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network);
static void setOverEndTime();
private:
static std::vector<unsigned int> m_dstBlackListSlot1RF;
@@ -40,6 +41,8 @@ private:
static std::vector<unsigned int> m_SrcIdBlacklist;
static std::vector<unsigned int> m_prefixes;
static unsigned int m_callHang;
static bool m_selfOnly;
static unsigned int m_id;
@@ -52,6 +55,7 @@ private:
static std::time_t m_time;
static unsigned int m_dstRewriteID;
static unsigned int m_SrcID;
};