From aa69f1a660117cb85602c8cd1a23259fa5a495f3 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 19 Sep 2016 18:07:14 +0100 Subject: [PATCH] Disabled broken memcpy() causing segfault --- DMRAccessControl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp index 513c6f0..8efb4cd 100644 --- a/DMRAccessControl.cpp +++ b/DMRAccessControl.cpp @@ -203,18 +203,18 @@ bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network, CDMRLC* dmrLC) { - if (slot == 1 && m_TGRewriteSlot1 == false) - return 0; + // if (slot == 1 && m_TGRewriteSlot1 == false) + // return 0; - if (slot == 2 && m_TGRewriteSlot2 == false) - return 0; + // if (slot == 2 && m_TGRewriteSlot2 == false) + // return 0; std::time_t currenttime = std::time(nullptr); if (network) { m_dstRewriteID = did; m_SrcID = sid; - memcpy(&dmrLC, &m_lastdmrLC, sizeof(dmrLC)); + //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;