diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 3c5e43e..0f44e90 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1486,8 +1486,8 @@ bool CDMRSlot::DstIdBlacklist(unsigned int did, unsigned int slot) bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) { if (slot == 1) { - if(m_dstWhiteListSlot1.size == 0) - return; + if(m_dstWhiteListSlot1.size() == 0) + return true; // 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) { @@ -1500,8 +1500,8 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) return true; } } else { - if(m_dstWhiteListSlot2.size == 0) - return; + if(m_dstWhiteListSlot2.size() == 0) + return true; //On slot2 we allow reflector control IDs, but not secondary TG IDs unless specifically listed 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 c0c7258..940009d 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -307,13 +307,13 @@ int CMMDVMHost::run() if (blackList.size() > 0U) LogInfo(" Black List: %u", blackList.size()); 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) - 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) - 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) - 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(" Lookup File: %s", lookupFile.length() > 0U ? lookupFile.c_str() : "None");