From 63584b4a3ae094842255c230696e64e26e8e8cd6 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 10 Jun 2016 10:57:58 +0100 Subject: [PATCH] more logging tidying for acl --- DMRSlot.cpp | 4 ++-- MMDVMHost.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 0f44e90..1432025 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1488,7 +1488,7 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) if (slot == 1) { if(m_dstWhiteListSlot1.size() == 0) 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 (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 { if(m_dstWhiteListSlot2.size() == 0) 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 (std::find(m_dstWhiteListSlot2.begin(), m_dstWhiteListSlot2.end(), did) != m_dstWhiteListSlot2.end() || did >= 4000) { diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 940009d..2d37f93 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -313,7 +313,7 @@ int CMMDVMHost::run() if (dstIDWhiteListSlot1.size() > 0U) LogInfo(" Slot 1 Destination ID White List: %u entries", dstIDWhiteListSlot1.size()); 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(" Lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None");