From 46194fff159ae0a1666bbae70e15240202ec86a5 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 19 Sep 2016 16:16:50 +0100 Subject: [PATCH] still trying --- DMRAccessControl.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp index 413e972..ff6dd7c 100644 --- a/DMRAccessControl.cpp +++ b/DMRAccessControl.cpp @@ -19,7 +19,6 @@ #include #include #include -#include std::vector DMRAccessControl::m_dstBlackListSlot1RF; @@ -43,8 +42,6 @@ unsigned int DMRAccessControl::m_id = 0U; unsigned int DMRAccessControl::m_dstRewriteID = 0U; unsigned int DMRAccessControl::m_SrcID = 0U; -CDMRLC* DMRAccessControl::m_lastdmrLC; - std::time_t DMRAccessControl::m_time; unsigned int DMRAccessControl::m_callHang; @@ -214,14 +211,13 @@ unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, if (network) { m_dstRewriteID = did; m_SrcID = sid; - //memcpy(&dmrLC, &m_lastdmrLC, sizeof(dmrLC)); if ( (did < 4000 || did > 5000) && did > 0 && did != 9 && dmrLC->getFLCO() == FLCO_GROUP ) { LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did); return 9; // rewrite incoming BM voice prompts to TG 9 } else if ((sid >= 4000 && sid <= 5000) && dmrLC->getFLCO() == FLCO_USER_USER) { dmrLC->setFLCO(FLCO_GROUP); - LogMessage("DMR Slot %u, Rewrite inbound private call to %u to Group Call on TG 9 (BM reflector voice prompt)",slot,did); + LogMessage("DMR Slot %u, Rewrite inbound private call to %u to Group Call on TG9",slot,did); return 9; } else { return 0;