Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update DMRAccessControl.cpp

Browse source 
Modified to match the first 7 digit of the DMR ID received over RF when in 'Self-Only' mode.
This commit is contained in:
Andy Taylor 2017-07-09 14:37:27 +01:00 committed by GitHub
parent d399ba9ebb
commit 4c0aa33cec
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
DMRAccessControl.cpp
View file

@ -22,6 +22,7 @@
#include <algorithm>
#include <vector>
#include <cstring>
#include <string>
std::vector<unsigned int> CDMRAccessControl::m_blackList;
std::vector<unsigned int> CDMRAccessControl::m_whiteList;
@ -48,8 +49,16 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
bool CDMRAccessControl::validateSrcId(unsigned int id)
{
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 (m_selfOnly) {
// return id == m_id;
if (str_m_id.compare(0,7,str_id) == 0) {// 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())
return false;