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

Tided up logging text for acl

Browse source
This commit is contained in:
Simon 2016-06-10 10:42:04 +01:00
parent 352503b823
commit cb9ec738e1
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
DMRSlot.cpp
View file

@ -1486,8 +1486,8 @@ bool CDMRSlot::DstIdBlacklist(unsigned int did, unsigned int slot)
bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k)
{ {
if (slot == 1) { if (slot == 1) {
if(m_dstWhiteListSlot1.size == 0) if(m_dstWhiteListSlot1.size() == 0)
return; return true;
// No reflectors on slot1, so we only allow all IDs over 10000 unless specifically whitelisted // No reflectors on slot1, so we only allow all IDs over 10000 unless specifically whitelisted
if(gt4k) { if(gt4k) {
if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did >= 10000) { if (std::find(m_dstWhiteListSlot1.begin(), m_dstWhiteListSlot1.end(), did) != m_dstWhiteListSlot1.end() || did >= 10000) {
@ -1500,8 +1500,8 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k)
return true; return true;
} }
} else { } else {
if(m_dstWhiteListSlot2.size == 0) if(m_dstWhiteListSlot2.size() == 0)
return; return true;
//On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed //On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed
if(gt4k) { if(gt4k) {
if (std::find(m_dstWhiteListSlot2.begin(), m_dstWhiteListSlot2.end(), did) != m_dstWhiteListSlot2.end() || did >= 4000) { if (std::find(m_dstWhiteListSlot2.begin(), m_dstWhiteListSlot2.end(), did) != m_dstWhiteListSlot2.end() || did >= 4000) {

8
MMDVMHost.cpp
View file

@ -307,13 +307,13 @@ int CMMDVMHost::run()
if (blackList.size() > 0U) if (blackList.size() > 0U)
LogInfo(" Black List: %u", blackList.size()); LogInfo(" Black List: %u", blackList.size());
if (dstIDBlackListSlot1.size() > 0U) if (dstIDBlackListSlot1.size() > 0U)
LogInfo(" Slot 1 Destination ID Black List: %u", dstIDBlackListSlot1.size()); LogInfo(" Slot 1 Destination ID Black List: %u entries", dstIDBlackListSlot1.size());
if (dstIDBlackListSlot2.size() > 0U) if (dstIDBlackListSlot2.size() > 0U)
LogInfo(" Slot 2 Destination ID Black List: %u", dstIDBlackListSlot2.size()); LogInfo(" Slot 2 Destination ID Black List: %u entries", dstIDBlackListSlot2.size());
if (dstIDWhiteListSlot1.size() > 0U) if (dstIDWhiteListSlot1.size() > 0U)
LogInfo(" Slot 1 Destination ID White List: %u", dstIDWhiteListSlot1.size()); LogInfo(" Slot 1 Destination ID White List: %u entries", dstIDWhiteListSlot1.size());
if (dstIDWhiteListSlot2.size() > 0U) if (dstIDWhiteListSlot2.size() > 0U)
LogInfo(" Slot 1 Destination ID White List: %u", dstIDWhiteListSlot2.size()); LogInfo(" Slot 1 Destination ID White List: %u entries", dstIDWhiteListSlot2.size());
LogInfo(" Timeout: %us", timeout); LogInfo(" Timeout: %us", timeout);
LogInfo(" Lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None"); LogInfo(" Lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None");