g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-07 07:23:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Validate the wake up CSBK correctly.

Browse source
This commit is contained in:
Jonathan Naylor 2016-11-10 18:43:54 +00:00
parent 19e270f4b9
commit eacc588636
7 changed files with 81 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
DMRAccessControl.h
View file

@ -20,10 +20,12 @@
#include "DMRLC.h"
class DMRAccessControl {
class CDMRAccessControl {
public:
static bool validateAccess(unsigned int srcId, unsigned int dstId, unsigned int slot, bool network);
static bool validateSrcId(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, bool tgRewrteSlot1, bool tgRewrteSlot2, bool m_bmAutoRewrite, bool m_bmRewriteReflectorVoicePrompts);
static unsigned int dstIdRewrite(unsigned int id, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC);
@ -53,15 +55,11 @@ private:
static bool dstIdBlacklist(unsigned int did, unsigned int slot, bool network);
static bool dstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network);
static bool validateSrcId(unsigned int id);
static time_t m_time[2];
static unsigned int m_dstRewriteID[2];
static unsigned int m_srcID[2];
static bool m_tgRewriteSlot1;
static bool m_tgRewriteSlot2;
static bool m_bmAutoRewrite;