Initialise variables properly and restructure.

This commit is contained in:
Jonathan Naylor 2016-12-22 09:14:39 +00:00 committed by GitHub
parent 8732817437
commit ddeb81a600

View file

@ -33,13 +33,16 @@ void CDMRAccessControl::init(const std::vector<unsigned int>& blacklist, const s
{ {
m_blackList = blacklist; m_blackList = blacklist;
m_whiteList = whitelist; m_whiteList = whitelist;
m_selfOnly = selfOnly;
m_prefixes = prefixes;
m_id = id;
} }
bool CDMRAccessControl::validateId(unsigned int id) bool CDMRAccessControl::validateId(unsigned int id)
{ {
if (m_selfOnly) { if (m_selfOnly)
return id == m_id; return id == m_id;
} else {
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;
@ -57,5 +60,4 @@ bool CDMRAccessControl::validateId(unsigned int id)
return std::find(m_whiteList.begin(), m_whiteList.end(), id) != m_whiteList.end(); return std::find(m_whiteList.begin(), m_whiteList.end(), id) != m_whiteList.end();
return true; return true;
}
} }