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

more logging tidying for acl

Browse Source
This commit is contained in:
Simon
2016-06-10 10:57:58 +01:00
parent cb9ec738e1
commit 63584b4a3a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMRSlot.cpp
View File

@@ -1488,7 +1488,7 @@ 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 true; 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) {
@@ -1502,7 +1502,7 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k)
} else { } else {
if(m_dstWhiteListSlot2.size() == 0) if(m_dstWhiteListSlot2.size() == 0)
return true; 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. Also allow echo.
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) {

2
MMDVMHost.cpp
View File

@@ -313,7 +313,7 @@ int CMMDVMHost::run()
if (dstIDWhiteListSlot1.size() > 0U) if (dstIDWhiteListSlot1.size() > 0U)
LogInfo(" Slot 1 Destination ID White List: %u entries", 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 entries", dstIDWhiteListSlot2.size()); LogInfo(" Slot 2 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");