From 730d14fde2703fad2f7b973421aeb8d568fe77ca Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Sat, 17 Sep 2016 16:29:43 +0100 Subject: [PATCH 1/2] Clean up TG rewrite code. --- Conf.cpp | 12 ++-- Conf.h | 4 +- DMRAccessControl.cpp | 141 ++++++++++++++++++++++--------------------- DMRAccessControl.h | 24 ++++---- DMRSlot.cpp | 64 +++++++++----------- MMDVM.ini | 2 + MMDVMHost.cpp | 19 +++--- 7 files changed, 129 insertions(+), 137 deletions(-) diff --git a/Conf.cpp b/Conf.cpp index b87724e..13b9c5e 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -93,8 +93,8 @@ m_dmrBeacons(false), m_dmrId(0U), m_dmrColorCode(2U), m_dmrSelfOnly(false), -m_TGRewriteSlot1(false), -m_TGRewriteSlot2(false), +m_dmrTGRewriteSlot1(false), +m_dmrTGRewriteSlot2(false), m_dmrPrefixes(), m_dmrBlackList(), m_dmrDstIdBlacklistSlot1RF(), @@ -333,9 +333,9 @@ bool CConf::read() else if (::strcmp(key, "SelfOnly") == 0) m_dmrSelfOnly = ::atoi(value) == 1; else if (::strcmp(key, "TGRewriteSlot1") == 0) - m_TGRewriteSlot1 = ::atoi(value) == 1; + m_dmrTGRewriteSlot1 = ::atoi(value) == 1; else if (::strcmp(key, "TGRewriteSlot2") == 0) - m_TGRewriteSlot2 = ::atoi(value) == 1; + m_dmrTGRewriteSlot2 = ::atoi(value) == 1; else if (::strcmp(key, "Prefixes") == 0) { char* p = ::strtok(value, ",\r\n"); while (p != NULL) { @@ -756,12 +756,12 @@ bool CConf::getDMRSelfOnly() const bool CConf::getDMRTGRewriteSlot1() const { - return m_TGRewriteSlot1; + return m_dmrTGRewriteSlot1; } bool CConf::getDMRTGRewriteSlot2() const { - return m_TGRewriteSlot2; + return m_dmrTGRewriteSlot2; } std::vector CConf::getDMRPrefixes() const diff --git a/Conf.h b/Conf.h index 39f9b48..6232750 100644 --- a/Conf.h +++ b/Conf.h @@ -215,8 +215,8 @@ private: unsigned int m_dmrId; unsigned int m_dmrColorCode; bool m_dmrSelfOnly; - bool m_TGRewriteSlot1; - bool m_TGRewriteSlot2; + bool m_dmrTGRewriteSlot1; + bool m_dmrTGRewriteSlot2; std::vector m_dmrPrefixes; std::vector m_dmrBlackList; std::vector m_dmrDstIdBlacklistSlot1RF; diff --git a/DMRAccessControl.cpp b/DMRAccessControl.cpp index e2a9808..3f171e5 100644 --- a/DMRAccessControl.cpp +++ b/DMRAccessControl.cpp @@ -20,51 +20,51 @@ #include #include -std::vector DMRAccessControl::m_dstBlackListSlot1RF; -std::vector DMRAccessControl::m_dstBlackListSlot2RF; -std::vector DMRAccessControl::m_dstWhiteListSlot1RF; -std::vector DMRAccessControl::m_dstWhiteListSlot2RF; +std::vector CDMRAccessControl::m_dstBlackListSlot1RF; +std::vector CDMRAccessControl::m_dstBlackListSlot2RF; +std::vector CDMRAccessControl::m_dstWhiteListSlot1RF; +std::vector CDMRAccessControl::m_dstWhiteListSlot2RF; -std::vector DMRAccessControl::m_dstBlackListSlot1NET; -std::vector DMRAccessControl::m_dstBlackListSlot2NET; -std::vector DMRAccessControl::m_dstWhiteListSlot1NET; -std::vector DMRAccessControl::m_dstWhiteListSlot2NET; +std::vector CDMRAccessControl::m_dstBlackListSlot1NET; +std::vector CDMRAccessControl::m_dstBlackListSlot2NET; +std::vector CDMRAccessControl::m_dstWhiteListSlot1NET; +std::vector CDMRAccessControl::m_dstWhiteListSlot2NET; -std::vector DMRAccessControl::m_SrcIdBlacklist; +std::vector CDMRAccessControl::m_srcIdBlacklist; -std::vector DMRAccessControl::m_prefixes; +std::vector CDMRAccessControl::m_prefixes; -bool DMRAccessControl::m_selfOnly = false; +bool CDMRAccessControl::m_selfOnly = false; -unsigned int DMRAccessControl::m_id = 0U; +unsigned int CDMRAccessControl::m_id = 0U; -unsigned int DMRAccessControl::m_dstRewriteID = 0U; -unsigned int DMRAccessControl::m_SrcID = 0U; +unsigned int CDMRAccessControl::m_dstRewriteID = 0U; +unsigned int CDMRAccessControl::m_srcID = 0U; -std::time_t DMRAccessControl::m_time; +std::time_t CDMRAccessControl::m_time; -unsigned int DMRAccessControl::m_callHang; +unsigned int CDMRAccessControl::m_callHang = 0U; -bool DMRAccessControl::m_TGRewriteSlot1; -bool DMRAccessControl::m_TGRewriteSlot2; +bool CDMRAccessControl::m_tgRewriteSlot1 = false; +bool CDMRAccessControl::m_tgRewriteSlot2 = false; -void DMRAccessControl::init(const std::vector& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, const std::vector& SrcIdBlacklist, bool selfOnly, const std::vector& prefixes,unsigned int id,unsigned int callHang,bool TGRewriteSlot1, bool TGRewriteSlot2) +void CDMRAccessControl::init(const std::vector& dstIdBlacklistSlot1RF, const std::vector& dstIdWhitelistSlot1RF, const std::vector& dstIdBlacklistSlot2RF, const std::vector& dstIdWhitelistSlot2RF, const std::vector& dstIdBlacklistSlot1NET, const std::vector& dstIdWhitelistSlot1NET, const std::vector& dstIdBlacklistSlot2NET, const std::vector& dstIdWhitelistSlot2NET, const std::vector& srcIdBlacklist, bool selfOnly, const std::vector& prefixes, unsigned int id, unsigned int callHang, bool tgRewriteSlot1, bool tgRewriteSlot2) { - m_dstBlackListSlot1RF = DstIdBlacklistSlot1RF; - m_dstWhiteListSlot1RF = DstIdWhitelistSlot1RF; - m_dstBlackListSlot2RF = DstIdBlacklistSlot2RF; - m_dstWhiteListSlot2RF = DstIdWhitelistSlot2RF; - m_dstBlackListSlot1NET = DstIdBlacklistSlot1NET; - m_dstWhiteListSlot1NET = DstIdWhitelistSlot1NET; - m_dstBlackListSlot2NET = DstIdBlacklistSlot2NET; - m_dstWhiteListSlot2NET = DstIdWhitelistSlot2NET; - m_callHang = callHang; - m_TGRewriteSlot1 = TGRewriteSlot1; - m_TGRewriteSlot2 = TGRewriteSlot2; + m_dstBlackListSlot1RF = dstIdBlacklistSlot1RF; + m_dstWhiteListSlot1RF = dstIdWhitelistSlot1RF; + m_dstBlackListSlot2RF = dstIdBlacklistSlot2RF; + m_dstWhiteListSlot2RF = dstIdWhitelistSlot2RF; + m_dstBlackListSlot1NET = dstIdBlacklistSlot1NET; + m_dstWhiteListSlot1NET = dstIdWhitelistSlot1NET; + m_dstBlackListSlot2NET = dstIdBlacklistSlot2NET; + m_dstWhiteListSlot2NET = dstIdWhitelistSlot2NET; + m_callHang = callHang; + m_tgRewriteSlot1 = tgRewriteSlot1; + m_tgRewriteSlot2 = tgRewriteSlot2; } -bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool network) +bool CDMRAccessControl::dstIdBlacklist(unsigned int did, unsigned int slot, bool network) { static std::vector blacklist; @@ -83,7 +83,7 @@ bool DMRAccessControl::DstIdBlacklist(unsigned int did, unsigned int slot, bool return std::find(blacklist.begin(), blacklist.end(), did) != blacklist.end(); } -bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network) +bool CDMRAccessControl::dstIdWhitelist(unsigned int did, unsigned int slot, bool gt4k, bool network) { if (network) { if (slot == 1U) { @@ -107,8 +107,9 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool if (gt4k) { if (std::find(m_dstWhiteListSlot2NET.begin(), m_dstWhiteListSlot2NET.end(), did) != m_dstWhiteListSlot2NET.end() || did == 0) return true; - // If dstId in secondary TG range or whitelist - else if (did >= 4000) { + + // If dstId in secondary TG range or whitelist + else if (did >= 4000U) { if (did > 5000U && did < 10000U) return false; else @@ -144,7 +145,7 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool if (std::find(m_dstWhiteListSlot2RF.begin(), m_dstWhiteListSlot2RF.end(), did) != m_dstWhiteListSlot2RF.end() || did == 0) return true; // If dstId in secondary TG range or whitelist - else if (did >= 4000) { + else if (did >= 4000U) { if (did > 5000U && did < 10000U) return false; else @@ -160,12 +161,12 @@ bool DMRAccessControl::DstIdWhitelist(unsigned int did, unsigned int slot, bool } } -bool DMRAccessControl::validateSrcId(unsigned int id) +bool CDMRAccessControl::validateSrcId(unsigned int id) { if (m_selfOnly) { return id == m_id; } else { - if (std::find(m_SrcIdBlacklist.begin(), m_SrcIdBlacklist.end(), id) != m_SrcIdBlacklist.end()) + if (std::find(m_srcIdBlacklist.begin(), m_srcIdBlacklist.end(), id) != m_srcIdBlacklist.end()) return false; unsigned int prefix = id / 10000U; @@ -179,54 +180,54 @@ bool DMRAccessControl::validateSrcId(unsigned int id) } } -bool DMRAccessControl::validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network) +bool CDMRAccessControl::validateAccess (unsigned int srcId, unsigned int dstId, unsigned int slot, bool network) { // source ID validation is only applied to RF traffic - if (!network && !DMRAccessControl::validateSrcId(src_id)) { - LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, src_id); + if (!network && !CDMRAccessControl::validateSrcId(srcId)) { + LogMessage("DMR Slot %u, invalid access attempt from %u (blacklisted)", slot, srcId); return false; - } else if (DMRAccessControl::DstIdBlacklist(dst_id, slot, network)) { - LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dst_id); + } else if (CDMRAccessControl::dstIdBlacklist(dstId, slot, network)) { + LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG blacklisted)", slot, dstId); return false; - } else if (!DMRAccessControl::DstIdWhitelist(dst_id, slot, true, network)) { - LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dst_id); + } else if (!CDMRAccessControl::dstIdWhitelist(dstId, slot, true, network)) { + LogMessage("DMR Slot %u, invalid access attempt to TG%u (TG not in whitelist)", slot, dstId); return false; } else { return true; } } -unsigned int DMRAccessControl::DstIdRewrite (unsigned int did, unsigned int sid, unsigned int slot, bool network) +unsigned int CDMRAccessControl::dstIdRewrite(unsigned int did, unsigned int sid, unsigned int slot, bool network) { + if (slot == 1U && !m_tgRewriteSlot1) + return 0; - if (slot == 1 && m_TGRewriteSlot1 == false) - return 0; - - if (slot == 2 && m_TGRewriteSlot2 == false) - return 0; + if (slot == 2U && !m_tgRewriteSlot2) + return 0; - std::time_t currenttime = std::time(nullptr); + std::time_t currenttime = std::time(nullptr); - if (network) { - m_dstRewriteID = did; - m_SrcID = sid; - if (did < 4000 && did > 0 && did != 9) { - LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9",slot,did); - return 9; - } else { - return 0; - } - } else if (did == 9 && m_dstRewriteID != 9 && m_dstRewriteID != 0 && (m_time + m_callHang) > currenttime) { - LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID); - return(m_dstRewriteID); - } else if (did < 4000 && did > 0 && did !=9) { - m_dstRewriteID = did; - } - return 0; + if (network) { + m_dstRewriteID = did; + m_srcID = sid; + + if (did < 4000U && did > 0 && did != 9U) { + LogMessage("DMR Slot %u, Rewrite DST ID (TG) of of inbound network traffic from %u to 9", slot, did); + return 9U; + } else { + return 0U; + } + } else if (did == 9U && m_dstRewriteID != 9U && m_dstRewriteID != 0U && (m_time + m_callHang) > currenttime) { + LogMessage("DMR Slot %u, Rewrite DST ID (TG) of outbound network traffic from %u to %u (return traffic during CallHang)",slot,did,m_dstRewriteID); + return m_dstRewriteID; + } else if (did < 4000U && did > 0U && did != 9U) { + m_dstRewriteID = did; + } + + return 0U; } - -void DMRAccessControl::setOverEndTime() +void CDMRAccessControl::setOverEndTime() { - m_time = std::time(nullptr); + m_time = std::time(nullptr); } diff --git a/DMRAccessControl.h b/DMRAccessControl.h index ec36497..4e4c903 100644 --- a/DMRAccessControl.h +++ b/DMRAccessControl.h @@ -18,13 +18,14 @@ #include #include -class DMRAccessControl { +class CDMRAccessControl { public: - static bool validateAccess (unsigned int src_id, unsigned int dst_id, unsigned int slot, bool network); + static bool validateAccess(unsigned int srcId, unsigned int dstId, unsigned int slot, bool network); - static void init(const std::vector& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, const std::vector& SrcIdBlacklist, bool selfOnly, const std::vector& prefixes,unsigned int id,unsigned int callHang, bool TGRewrteSlot1, bool TGRewrteSlot2); + static void init(const std::vector& dstIdBlacklistSlot1RF, const std::vector& dstIdWhitelistSlot1RF, const std::vector& dstIdBlacklistSlot2RF, const std::vector& dstIdWhitelistSlot2RF, const std::vector& dstIdBlacklistSlot1NET, const std::vector& dstIdWhitelistSlot1NET, const std::vector& dstIdBlacklistSlot2NET, const std::vector& dstIdWhitelistSlot2NET, const std::vector& srcIdBlacklist, bool selfOnly, const std::vector& prefixes, unsigned int id, unsigned int callHang, bool tgRewrteSlot1, bool tgRewrteSlot2); - static unsigned int DstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network); + static unsigned int dstIdRewrite(unsigned int id, unsigned int sid,unsigned int slot, bool network); + static void setOverEndTime(); private: @@ -38,7 +39,7 @@ private: static std::vector m_dstWhiteListSlot1NET; static std::vector m_dstWhiteListSlot2NET; - static std::vector m_SrcIdBlacklist; + static std::vector m_srcIdBlacklist; static std::vector m_prefixes; @@ -47,21 +48,18 @@ private: static bool m_selfOnly; static unsigned int m_id; - static bool DstIdBlacklist(unsigned int did,unsigned int slot, bool network); - static bool DstIdWhitelist(unsigned int did,unsigned int slot,bool gt4k, bool network); + static bool dstIdBlacklist(unsigned int did,unsigned int slot, bool network); + static bool dstIdWhitelist(unsigned int did,unsigned int slot,bool gt4k, bool network); static bool validateSrcId(unsigned int id); static std::time_t m_time; static unsigned int m_dstRewriteID; - static unsigned int m_SrcID; + static unsigned int m_srcID; - static bool m_TGRewriteSlot1; - static bool m_TGRewriteSlot2; - - - + static bool m_tgRewriteSlot1; + static bool m_tgRewriteSlot2; }; #endif diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 3cdde6d..8f3b25c 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -154,16 +154,14 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len) unsigned int sid = lc->getSrcId(); unsigned int did = lc->getDstId(); - if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, false)) { + if (!CDMRAccessControl::validateAccess(sid, did, m_slotNo, false)) { delete lc; return; } - unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false); - if (rw_id) { - - lc->setDstId(rw_id); - } + unsigned int rwId = CDMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false); + if (rwId != 0U) + lc->setDstId(rwId); m_rfLC = lc; @@ -262,7 +260,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len) LogMessage("DMR Slot %u, received RF end of voice transmission, %.1f seconds, BER: %.1f%%", m_slotNo, float(m_rfFrames) / 16.667F, float(m_rfErrs * 100U) / float(m_rfBits)); writeEndRF(); - DMRAccessControl::setOverEndTime(); + CDMRAccessControl::setOverEndTime(); } else if (dataType == DT_DATA_HEADER) { if (m_rfState == RS_RF_DATA) return; @@ -275,10 +273,9 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len) bool gi = dataHeader.getGI(); unsigned int srcId = dataHeader.getSrcId(); unsigned int dstId = dataHeader.getDstId(); - if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) + if (!CDMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) return; - m_rfFrames = dataHeader.getBlocks(); m_rfDataHeader = dataHeader; @@ -331,7 +328,7 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len) bool gi = csbk.getGI(); unsigned int srcId = csbk.getSrcId(); unsigned int dstId = csbk.getDstId(); - if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) + if (!CDMRAccessControl::validateAccess(srcId, dstId, m_slotNo, false)) return; // Regenerate the CSBK data @@ -488,16 +485,15 @@ void CDMRSlot::writeModem(unsigned char *data, unsigned int len) if (lc != NULL) { unsigned int sid = lc->getSrcId(); unsigned int did = lc->getDstId(); - if (!DMRAccessControl::validateAccess(sid,did,m_slotNo,false)) { + if (!CDMRAccessControl::validateAccess(sid, did, m_slotNo, false)) { delete lc; return; } + // Test dst rewrite - unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,false); - if (rw_id) { - - lc->setDstId(rw_id); - } + unsigned int rwId = CDMRAccessControl::dstIdRewrite(did, sid, m_slotNo, false); + if (rwId != 0U) + lc->setDstId(rwId); m_rfLC = lc; @@ -774,15 +770,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) unsigned int did = m_netLC->getDstId(); unsigned int sid = m_netLC->getSrcId(); - if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(sid, did, m_slotNo, true)) return; // Test dst rewrite - unsigned int rw_id = DMRAccessControl::DstIdRewrite(did, sid,m_slotNo, true); - if (rw_id) { - - m_netLC->setDstId(rw_id); - } + unsigned int rwId = CDMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true); + if (rwId != 0U) + m_netLC->setDstId(rwId); // Store the LC for the embedded LC m_netEmbeddedLC.setData(*m_netLC); @@ -844,15 +838,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) unsigned int did = m_netLC->getDstId(); unsigned int sid = m_netLC->getSrcId(); - if (!DMRAccessControl::validateAccess(sid, did, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(sid, did, m_slotNo, true)) return; // Test dst rewrite - unsigned int rw_id = DMRAccessControl::DstIdRewrite(did,sid,m_slotNo,true); - if (rw_id) { - - m_netLC->setDstId(rw_id); - } + unsigned int rwId = CDMRAccessControl::dstIdRewrite(did, sid, m_slotNo, true); + if (rwId != 0U) + m_netLC->setDstId(rwId); // Regenerate the Slot Type CDMRSlotType slotType; @@ -883,7 +875,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) unsigned int did = m_netLC->getDstId(); unsigned int id = m_netLC->getSrcId(); - if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(id, did, m_slotNo, true)) return; // Regenerate the LC data @@ -919,7 +911,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) LogMessage("DMR Slot %u, received network end of voice transmission, %.1f seconds, %u%% packet loss, BER: %.1f%%", m_slotNo, float(m_netFrames) / 16.667F, (m_netLost * 100U) / m_netFrames, float(m_netErrs * 100U) / float(m_netBits)); writeEndNet(); - DMRAccessControl::setOverEndTime(); + CDMRAccessControl::setOverEndTime(); } else if (dataType == DT_DATA_HEADER) { if (m_netState == RS_NET_DATA) return; @@ -936,7 +928,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) bool gi = dataHeader.getGI(); unsigned int srcId = dataHeader.getSrcId(); unsigned int dstId = dataHeader.getDstId(); - if (!DMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) return; m_netFrames = dataHeader.getBlocks(); @@ -981,7 +973,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) unsigned int did = dmrData.getDstId(); unsigned int id = dmrData.getSrcId(); - if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(id, did, m_slotNo, true)) return; m_lastFrameValid = false; @@ -1080,7 +1072,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) unsigned int did = m_netLC->getDstId(); unsigned int id = m_netLC->getSrcId(); - if (!DMRAccessControl::validateAccess(id, did, m_slotNo, true)) + if (!CDMRAccessControl::validateAccess(id, did, m_slotNo, true)) return; unsigned char fid = m_netLC->getFID(); @@ -1140,7 +1132,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData) bool gi = csbk.getGI(); unsigned int srcId = csbk.getSrcId(); unsigned int dstId = csbk.getDstId(); - if (!DMRAccessControl::validateAccess(srcId,dstId,m_slotNo,true)) + if (!CDMRAccessControl::validateAccess(srcId, dstId, m_slotNo, true)) return; // Regenerate the CSBK data @@ -1362,7 +1354,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data) m_queue.addData(data, len); } -void CDMRSlot::init(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector& prefixes, const std::vector& SrcIdBlacklist, const std::vector& DstIdBlacklistSlot1RF, const std::vector& DstIdWhitelistSlot1RF, const std::vector& DstIdBlacklistSlot2RF, const std::vector& DstIdWhitelistSlot2RF, const std::vector& DstIdBlacklistSlot1NET, const std::vector& DstIdWhitelistSlot1NET, const std::vector& DstIdBlacklistSlot2NET, const std::vector& DstIdWhitelistSlot2NET, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, CDMRLookup* lookup, int rssiMultiplier, int rssiOffset, unsigned int jitter, bool TGRewriteSlot1, bool TGRewriteSlot2) +void CDMRSlot::init(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, const std::vector& prefixes, const std::vector& srcIdBlacklist, const std::vector& dstIdBlacklistSlot1RF, const std::vector& dstIdWhitelistSlot1RF, const std::vector& dstIdBlacklistSlot2RF, const std::vector& dstIdWhitelistSlot2RF, const std::vector& dstIdBlacklistSlot1NET, const std::vector& dstIdWhitelistSlot1NET, const std::vector& dstIdBlacklistSlot2NET, const std::vector& dstIdWhitelistSlot2NET, CModem* modem, CDMRIPSC* network, CDisplay* display, bool duplex, CDMRLookup* lookup, int rssiMultiplier, int rssiOffset, unsigned int jitter, bool tgRewriteSlot1, bool tgRewriteSlot2) { assert(id != 0U); assert(modem != NULL); @@ -1397,7 +1389,7 @@ void CDMRSlot::init(unsigned int id, unsigned int colorCode, unsigned int callHa slotType.getData(m_idle + 2U); //Load black and white lists to DMRAccessControl - DMRAccessControl::init(DstIdBlacklistSlot1RF, DstIdWhitelistSlot1RF, DstIdBlacklistSlot2RF, DstIdWhitelistSlot2RF, DstIdBlacklistSlot1NET, DstIdWhitelistSlot1NET, DstIdBlacklistSlot2NET, DstIdWhitelistSlot2NET, SrcIdBlacklist, m_selfOnly, m_prefixes, m_id,callHang, TGRewriteSlot1, TGRewriteSlot2); + CDMRAccessControl::init(dstIdBlacklistSlot1RF, dstIdWhitelistSlot1RF, dstIdBlacklistSlot2RF, dstIdWhitelistSlot2RF, dstIdBlacklistSlot1NET, dstIdWhitelistSlot1NET, dstIdBlacklistSlot2NET, dstIdWhitelistSlot2NET, srcIdBlacklist, m_selfOnly, m_prefixes, m_id, callHang, tgRewriteSlot1, tgRewriteSlot2); } diff --git a/MMDVM.ini b/MMDVM.ini index addf531..d8f9ba4 100644 --- a/MMDVM.ini +++ b/MMDVM.ini @@ -72,6 +72,8 @@ TXHang=4 #DstIdBlackListSlot2NET= #DstIdWhiteListSlot1NET= #DstIdWhiteListSlot2NET= +#TGRewriteSlot1=0 +#TGRewriteSlot2=0 [System Fusion] Enable=1 diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index 89aeb55..218eac0 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -296,8 +296,8 @@ int CMMDVMHost::run() unsigned int id = m_conf.getDMRId(); unsigned int colorCode = m_conf.getDMRColorCode(); bool selfOnly = m_conf.getDMRSelfOnly(); - bool TGRewriteSlot1 = m_conf.getDMRTGRewriteSlot1(); - bool TGRewriteSlot2 = m_conf.getDMRTGRewriteSlot2(); + bool tgRewriteSlot1 = m_conf.getDMRTGRewriteSlot1(); + bool tgRewriteSlot2 = m_conf.getDMRTGRewriteSlot2(); std::vector prefixes = m_conf.getDMRPrefixes(); std::vector blackList = m_conf.getDMRBlackList(); std::vector dstIDBlackListSlot1RF = m_conf.getDMRDstIdBlacklistSlot1RF(); @@ -356,15 +356,14 @@ int CMMDVMHost::run() LogInfo(" RSSI Multiplier: %d", rssiMultiplier); LogInfo(" RSSI Offset: %d", rssiOffset); } - - if (TGRewriteSlot1) - LogInfo(" TG Rewrite Slot 1 enabled"); - - if (TGRewriteSlot2) - LogInfo(" TG Rewrite Slot 2 enabled"); - - dmr = new CDMRControl(id, colorCode, callHang, selfOnly, prefixes, blackList,dstIDBlackListSlot1RF,dstIDWhiteListSlot1RF, dstIDBlackListSlot2RF, dstIDWhiteListSlot2RF, dstIDBlackListSlot1NET,dstIDWhiteListSlot1NET, dstIDBlackListSlot2NET, dstIDWhiteListSlot2NET, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, lookupFile, rssiMultiplier, rssiOffset, jitter, TGRewriteSlot1, TGRewriteSlot2); + if (tgRewriteSlot1) + LogInfo(" TG Rewrite Slot 1 enabled"); + + if (tgRewriteSlot2) + LogInfo(" TG Rewrite Slot 2 enabled"); + + dmr = new CDMRControl(id, colorCode, callHang, selfOnly, prefixes, blackList,dstIDBlackListSlot1RF,dstIDWhiteListSlot1RF, dstIDBlackListSlot2RF, dstIDWhiteListSlot2RF, dstIDBlackListSlot1NET,dstIDWhiteListSlot1NET, dstIDBlackListSlot2NET, dstIDWhiteListSlot2NET, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, lookupFile, rssiMultiplier, rssiOffset, jitter, tgRewriteSlot1, tgRewriteSlot2); m_dmrTXTimer.setTimeout(txHang); } From c757c41754d90428c1ff6a01f26144d7caf81d12 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 19 Sep 2016 17:55:28 +0100 Subject: [PATCH 2/2] Handle zero block length. --- DMRDataHeader.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DMRDataHeader.cpp b/DMRDataHeader.cpp index ef0922d..e7c39f2 100644 --- a/DMRDataHeader.cpp +++ b/DMRDataHeader.cpp @@ -152,6 +152,9 @@ unsigned int CDMRDataHeader::getDstId() const unsigned int CDMRDataHeader::getBlocks() const { + if (m_blocks == 0U) + return 1U; + return m_blocks; }