From cfa70a0388b608d60eb4bb8d9e5953b6a8a914d5 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 3 Jul 2016 18:41:08 +0100 Subject: [PATCH] more whitelist tidying --- DMRSlot.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index b120336..ccf8a51 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1530,9 +1530,9 @@ bool CDMRSlot::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k) //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) { + if (std::find(m_dstWhiteListSlot2.begin(), m_dstWhiteListSlot2.end(), did) != m_dstWhiteListSlot2.end() || did >= 4000 || did == 0) { //if dstId in secondary TG range - if (did > 5000U && did < 10000U) + if (did > 5000U && did < 10000U || did == 0) return false; else return true;