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

Update DMRAccessControl.cpp

Browse source 
Updated to make string conversion only when needed and to re-add the id == m_id compare
This commit is contained in:
Andy Taylor 2017-07-09 16:40:16 +01:00 committed by GitHub
parent 4c0aa33cec
commit fc34ea916f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DMRAccessControl.cpp
View file

@ -49,11 +49,10 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
bool CDMRAccessControl::validateSrcId(unsigned int 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
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