MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from AndyTaylorTweet/master

Browse Source 
Update DMRAccessControl.cpp
This commit is contained in:
Jonathan Naylor
2017-07-09 18:43:24 +01:00
committed by GitHub
parent d399ba9ebb fc34ea916f
commit 8e9309f7a9
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMRAccessControl.cpp
View File

@@ -22,6 +22,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <cstring> #include <cstring>
#include <string>
std::vector<unsigned int> CDMRAccessControl::m_blackList; std::vector<unsigned int> CDMRAccessControl::m_blackList;
std::vector<unsigned int> CDMRAccessControl::m_whiteList; std::vector<unsigned int> CDMRAccessControl::m_whiteList;
@@ -48,8 +49,15 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
bool CDMRAccessControl::validateSrcId(unsigned int id) bool CDMRAccessControl::validateSrcId(unsigned int id)
{ {
if (m_selfOnly) if (m_selfOnly) {
return id == m_id; std::string str_id = std::to_string(id); // DMR ID from RF
std::string str_m_id = std::to_string(m_id); // MMDVMHost ID from Config
if ((id == m_id) || (str_m_id.compare(0,7,str_id) == 0)) {// if the RF ID matched the configured ID or if the first 7 digits of the MMDVMHost ID match the WHOLE of the RF ID
return true; // then allow the connection
} else {
return false; // if not, reject it
}
}
if (std::find(m_blackList.begin(), m_blackList.end(), id) != m_blackList.end()) if (std::find(m_blackList.begin(), m_blackList.end(), id) != m_blackList.end())
return false; return false;