diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp index 4222007..a881ab2 100644 --- a/DMRAccessControl.cpp +++ b/DMRAccessControl.cpp @@ -32,16 +32,17 @@ std::vector DMRAccessControl::m_dstWhiteListSlot2NET; std::vector DMRAccessControl::m_SrcIdBlacklist; std::vector DMRAccessControl::m_prefixes; -bool DMRAccessControl::m_selfOnly; -unsigned int DMRAccessControl::m_id; + +bool DMRAccessControl::m_selfOnly = false; + +unsigned int DMRAccessControl::m_id = 0U; void DMRAccessControl::init(const std::vector& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, const std::vector& SrcIdBlacklist, bool selfOnly, const std::vector& prefixes,unsigned int id) { - - m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF; - m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF; - m_dstBlackListSlot2RF = DstIdBlacklistSlot2RF; - m_dstWhiteListSlot2RF = DstIdWhitelistSlot2RF; + m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF; + m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF; + m_dstBlackListSlot2RF = DstIdBlacklistSlot2RF; + m_dstWhiteListSlot2RF = DstIdWhitelistSlot2RF; m_dstBlackListSlot1NET = DstIdBlacklistSlot1NET; m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET; m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET; @@ -50,40 +51,32 @@ void DMRAccessControl::init(const std::vector& DstIdBlacklistSlot1 bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool network) { - static std::vector Blacklist; + static std::vector blacklist; if (slot == 1U) { - - if (network) { - Blacklist = m_dstBlackListSlot1NET; - } - else { - Blacklist = m_dstBlackListSlot1RF; - } + if (network) + blacklist = m_dstBlackListSlot1NET; + else + blacklist = m_dstBlackListSlot1RF; } else { - if (network) { - Blacklist = m_dstBlackListSlot2NET; - } - else { - Blacklist = m_dstBlackListSlot2RF; - } + if (network) + blacklist = m_dstBlackListSlot2NET; + else + blacklist = m_dstBlackListSlot2RF; } - if (std::find(Blacklist.begin(), Blacklist.end(), did) != Blacklist.end()) - return true; - return false; + return std::find(blacklist.begin(), blacklist.end(), did) != blacklist.end(); } bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network) { if (network) { - if (slot == 1U) { if (m_dstWhiteListSlot1NET.size() == 0U) return true; // No reflectors on slot1, so we only allow all IDs over 99999 unless specifically whitelisted. - //Allow traffic to TG0 as I think this is a special case - need to confirm + // Allow traffic to TG0 as I think this is a special case - need to confirm if (gt4k) { if (std::find(m_dstWhiteListSlot1NET.begin(), m_dstWhiteListSlot1NET.end(), did) != m_dstWhiteListSlot1NET.end() || did >= 99999U || did == 0) return true; @@ -95,34 +88,31 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool if (m_dstWhiteListSlot2NET.size() == 0U) return true; - //On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed. Also allow echo. + // On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed. Also allow echo. if (gt4k) { if (std::find(m_dstWhiteListSlot2NET.begin(), m_dstWhiteListSlot2NET.end(), did) != m_dstWhiteListSlot2NET.end() || did == 0) - return true; - - //if dstId in secondary TG range or whitelist + return true; + // If dstId in secondary TG range or whitelist else if (did >= 4000) { if (did > 5000U && did < 10000U) return false; else return true; } - } else { + } else { if (std::find(m_dstWhiteListSlot2NET.begin(), m_dstWhiteListSlot2NET.end(), did) != m_dstWhiteListSlot2NET.end()) return true; } } return false; - - } else { if (slot == 1U) { if (m_dstWhiteListSlot1RF.size() == 0U) return true; // No reflectors on slot1, so we only allow all IDs over 99999 unless specifically whitelisted. - //Allow traffic to TG0 as I think this is a special case - need to confirm + // Allow traffic to TG0 as I think this is a special case - need to confirm if (gt4k) { if (std::find(m_dstWhiteListSlot1RF.begin(), m_dstWhiteListSlot1RF.end(), did) != m_dstWhiteListSlot1RF.end() || did >= 99999U || did == 0) return true; @@ -134,26 +124,24 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool if (m_dstWhiteListSlot2RF.size() == 0U) return true; - //On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed. Also allow echo. + // On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed. Also allow echo. if (gt4k) { - if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end() || did == 0) - return true; - - //if dstId in secondary TG range or whitelist + if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end() || did == 0) + return true; + // If dstId in secondary TG range or whitelist else if (did >= 4000) { if (did > 5000U && did < 10000U) return false; else return true; } - } else { + } else { if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end()) return true; } } - return false; - + return false; } } @@ -180,19 +168,15 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, { // source ID validation is only applied to RF traffic if (!network && !DMRAccessControl::validateSrcId(src_id)) { - LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id); - return false; - - } - else if (DMRAccessControl::DstIdBlacklist(dst_id, slot, network)) { - LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dst_id); - return false; - } - else if (!DMRAccessControl::DstIdWhitelist(dst_id, slot, true, network)) { - LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dst_id); - return false; - } - else - return true; - + LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id); + return false; + } else if (DMRAccessControl::DstIdBlacklist(dst_id, slot, network)) { + LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dst_id); + return false; + } else if (!DMRAccessControl::DstIdWhitelist(dst_id, slot, true, network)) { + LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dst_id); + return false; + } else { + return true; + } } diff --git a/DMRAccessControl.h b/DMRAccessControl.h index 01ca408..78be7ba 100644 --- a/DMRAccessControl.h +++ b/DMRAccessControl.h @@ -19,13 +19,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& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, const std::vector& SrcIdBlacklist, bool selfOnly, const std::vector& prefixes,unsigned int id); + static void init(const std::vector& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, const std::vector& SrcIdBlacklist, bool selfOnly, const std::vector& prefixes,unsigned int id); - private: static std::vector m_dstBlackListSlot1RF; static std::vector m_dstBlackListSlot2RF; @@ -36,21 +33,18 @@ private: static std::vector m_dstBlackListSlot2NET; static std::vector m_dstWhiteListSlot1NET; static std::vector m_dstWhiteListSlot2NET; - + static std::vector m_SrcIdBlacklist; - + static std::vector m_prefixes; - + static bool m_selfOnly; static unsigned int m_id; - + 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); - - - }; -#endif \ No newline at end of file +#endif diff --git a/MMDVMHost.vcxproj b/MMDVMHost.vcxproj index 6442ecb..3939478 100644 --- a/MMDVMHost.vcxproj +++ b/MMDVMHost.vcxproj @@ -152,6 +152,7 @@ + @@ -206,6 +207,7 @@ + diff --git a/MMDVMHost.vcxproj.filters b/MMDVMHost.vcxproj.filters index ad76229..df4152c 100644 --- a/MMDVMHost.vcxproj.filters +++ b/MMDVMHost.vcxproj.filters @@ -170,6 +170,9 @@ Header Files + + Header Files + @@ -313,5 +316,8 @@ Source Files + + Source Files + \ No newline at end of file