diff --git a/Conf.cpp b/Conf.cpp index f28d47d..410650a 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -59,7 +59,7 @@ m_dmrNetwork1Port(0U), m_dmrNetwork1Local(0U), m_dmrNetwork1Password(), m_dmrNetwork1Debug(false), -m_dmrNetwork1Rewrites(), +m_dmrNetwork1TGRewrites(), m_dmrNetwork1PrivateSlot1(false), m_dmrNetwork1PrivateSlot2(false), m_dmrNetwork2Enabled(false), @@ -69,7 +69,7 @@ m_dmrNetwork2Port(0U), m_dmrNetwork2Local(0U), m_dmrNetwork2Password(), m_dmrNetwork2Debug(false), -m_dmrNetwork2Rewrites(), +m_dmrNetwork2TGRewrites(), m_dmrNetwork2PrivateSlot1(false), m_dmrNetwork2PrivateSlot2(false), m_xlxNetworkEnabled(false), @@ -198,7 +198,7 @@ bool CConf::read() m_dmrNetwork1Password = value; else if (::strcmp(key, "Debug") == 0) m_dmrNetwork1Debug = ::atoi(value) == 1; - else if (::strcmp(key, "Rewrite") == 0) { + else if (::strcmp(key, "TGRewrite") == 0) { char* p1 = ::strtok(value, ", "); char* p2 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", "); @@ -209,7 +209,7 @@ bool CConf::read() rewrite.m_fromTG = ::atoi(p2); rewrite.m_toSlot = ::atoi(p3); rewrite.m_toTG = ::atoi(p4); - m_dmrNetwork1Rewrites.push_back(rewrite); + m_dmrNetwork1TGRewrites.push_back(rewrite); } } else if (::strcmp(key, "PrivateSlot1") == 0) m_dmrNetwork1PrivateSlot1 = ::atoi(value) == 1; @@ -230,7 +230,7 @@ bool CConf::read() m_dmrNetwork2Password = value; else if (::strcmp(key, "Debug") == 0) m_dmrNetwork2Debug = ::atoi(value) == 1; - else if (::strcmp(key, "Rewrite") == 0) { + else if (::strcmp(key, "TGRewrite") == 0) { char* p1 = ::strtok(value, ", "); char* p2 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", "); @@ -241,7 +241,7 @@ bool CConf::read() rewrite.m_fromTG = ::atoi(p2); rewrite.m_toSlot = ::atoi(p3); rewrite.m_toTG = ::atoi(p4); - m_dmrNetwork2Rewrites.push_back(rewrite); + m_dmrNetwork2TGRewrites.push_back(rewrite); } } else if (::strcmp(key, "PrivateSlot1") == 0) m_dmrNetwork2PrivateSlot1 = ::atoi(value) == 1; @@ -410,9 +410,9 @@ bool CConf::getDMRNetwork1Debug() const return m_dmrNetwork1Debug; } -std::vector CConf::getDMRNetwork1Rewrites() const +std::vector CConf::getDMRNetwork1TGRewrites() const { - return m_dmrNetwork1Rewrites; + return m_dmrNetwork1TGRewrites; } bool CConf::getDMRNetwork1PrivateSlot1() const @@ -460,9 +460,9 @@ bool CConf::getDMRNetwork2Debug() const return m_dmrNetwork2Debug; } -std::vector CConf::getDMRNetwork2Rewrites() const +std::vector CConf::getDMRNetwork2TGRewrites() const { - return m_dmrNetwork2Rewrites; + return m_dmrNetwork2TGRewrites; } bool CConf::getDMRNetwork2PrivateSlot1() const diff --git a/Conf.h b/Conf.h index 9fc6e64..0e40c0c 100644 --- a/Conf.h +++ b/Conf.h @@ -65,7 +65,7 @@ public: unsigned int getDMRNetwork1Local() const; std::string getDMRNetwork1Password() const; bool getDMRNetwork1Debug() const; - std::vector getDMRNetwork1Rewrites() const; + std::vector getDMRNetwork1TGRewrites() const; bool getDMRNetwork1PrivateSlot1() const; bool getDMRNetwork1PrivateSlot2() const; @@ -77,7 +77,7 @@ public: unsigned int getDMRNetwork2Local() const; std::string getDMRNetwork2Password() const; bool getDMRNetwork2Debug() const; - std::vector getDMRNetwork2Rewrites() const; + std::vector getDMRNetwork2TGRewrites() const; bool getDMRNetwork2PrivateSlot1() const; bool getDMRNetwork2PrivateSlot2() const; @@ -119,7 +119,7 @@ private: unsigned int m_dmrNetwork1Local; std::string m_dmrNetwork1Password; bool m_dmrNetwork1Debug; - std::vector m_dmrNetwork1Rewrites; + std::vector m_dmrNetwork1TGRewrites; bool m_dmrNetwork1PrivateSlot1; bool m_dmrNetwork1PrivateSlot2; @@ -130,7 +130,7 @@ private: unsigned int m_dmrNetwork2Local; std::string m_dmrNetwork2Password; bool m_dmrNetwork2Debug; - std::vector m_dmrNetwork2Rewrites; + std::vector m_dmrNetwork2TGRewrites; bool m_dmrNetwork2PrivateSlot1; bool m_dmrNetwork2PrivateSlot2; diff --git a/DMRGateway.cpp b/DMRGateway.cpp index bc587cf..8dfaffd 100644 --- a/DMRGateway.cpp +++ b/DMRGateway.cpp @@ -136,16 +136,16 @@ m_dmr2PrivateSlot2(false) CDMRGateway::~CDMRGateway() { - for (std::vector::iterator it = m_dmr1NetRewrites.begin(); it != m_dmr1NetRewrites.end(); ++it) + for (std::vector::iterator it = m_dmr1NetRewrites.begin(); it != m_dmr1NetRewrites.end(); ++it) delete *it; - for (std::vector::iterator it = m_dmr1RFRewrites.begin(); it != m_dmr1RFRewrites.end(); ++it) + for (std::vector::iterator it = m_dmr1RFRewrites.begin(); it != m_dmr1RFRewrites.end(); ++it) delete *it; - for (std::vector::iterator it = m_dmr2NetRewrites.begin(); it != m_dmr2NetRewrites.end(); ++it) + for (std::vector::iterator it = m_dmr2NetRewrites.begin(); it != m_dmr2NetRewrites.end(); ++it) delete *it; - for (std::vector::iterator it = m_dmr2RFRewrites.begin(); it != m_dmr2RFRewrites.end(); ++it) + for (std::vector::iterator it = m_dmr2RFRewrites.begin(); it != m_dmr2RFRewrites.end(); ++it) delete *it; } @@ -369,7 +369,7 @@ int CDMRGateway::run() if (m_dmrNetwork1 != NULL) { // Rewrite the slot and/or TG or neither - for (std::vector::iterator it = m_dmr1RFRewrites.begin(); it != m_dmr1RFRewrites.end(); ++it) { + for (std::vector::iterator it = m_dmr1RFRewrites.begin(); it != m_dmr1RFRewrites.end(); ++it) { bool ret = (*it)->process(data); if (ret) { rewritten = true; @@ -390,7 +390,7 @@ int CDMRGateway::run() if (!rewritten) { if (m_dmrNetwork2 != NULL) { // Rewrite the slot and/or TG or neither - for (std::vector::iterator it = m_dmr2RFRewrites.begin(); it != m_dmr2RFRewrites.end(); ++it) { + for (std::vector::iterator it = m_dmr2RFRewrites.begin(); it != m_dmr2RFRewrites.end(); ++it) { bool ret = (*it)->process(data); if (ret) { rewritten = true; @@ -449,7 +449,7 @@ int CDMRGateway::run() } else { // Rewrite the slot and/or TG or neither bool rewritten = false; - for (std::vector::iterator it = m_dmr1NetRewrites.begin(); it != m_dmr1NetRewrites.end(); ++it) { + for (std::vector::iterator it = m_dmr1NetRewrites.begin(); it != m_dmr1NetRewrites.end(); ++it) { bool ret = (*it)->process(data); if (ret) { rewritten = true; @@ -493,7 +493,7 @@ int CDMRGateway::run() } else { // Rewrite the slot and/or TG or neither bool rewritten = false; - for (std::vector::iterator it = m_dmr2NetRewrites.begin(); it != m_dmr2NetRewrites.end(); ++it) { + for (std::vector::iterator it = m_dmr2NetRewrites.begin(); it != m_dmr2NetRewrites.end(); ++it) { bool ret = (*it)->process(data); if (ret) { rewritten = true; @@ -654,12 +654,12 @@ bool CDMRGateway::createDMRNetwork1() return false; } - std::vector rewrites = m_conf.getDMRNetwork1Rewrites(); + std::vector rewrites = m_conf.getDMRNetwork1TGRewrites(); for (std::vector::const_iterator it = rewrites.begin(); it != rewrites.end(); ++it) { - LogInfo(" Rewrite: %u:%u -> %u:%u", (*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); + LogInfo(" TG Rewrite: %u:%u -> %u:%u", (*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); - CRewrite* netRewrite = new CRewrite((*it).m_toSlot, (*it).m_toTG, (*it).m_fromSlot, (*it).m_fromTG); - CRewrite* rfRewrite = new CRewrite((*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); + CRewriteTG* netRewrite = new CRewriteTG((*it).m_toSlot, (*it).m_toTG, (*it).m_fromSlot, (*it).m_fromTG); + CRewriteTG* rfRewrite = new CRewriteTG((*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); m_dmr1NetRewrites.push_back(netRewrite); m_dmr1RFRewrites.push_back(rfRewrite); @@ -715,12 +715,12 @@ bool CDMRGateway::createDMRNetwork2() return false; } - std::vector rewrites = m_conf.getDMRNetwork2Rewrites(); + std::vector rewrites = m_conf.getDMRNetwork2TGRewrites(); for (std::vector::const_iterator it = rewrites.begin(); it != rewrites.end(); ++it) { - LogInfo(" Rewrite: %u:%u -> %u:%u", (*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); + LogInfo(" TG Rewrite: %u:%u -> %u:%u", (*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); - CRewrite* netRewrite = new CRewrite((*it).m_toSlot, (*it).m_toTG, (*it).m_fromSlot, (*it).m_fromTG); - CRewrite* rfRewrite = new CRewrite((*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); + CRewriteTG* netRewrite = new CRewriteTG((*it).m_toSlot, (*it).m_toTG, (*it).m_fromSlot, (*it).m_fromTG); + CRewriteTG* rfRewrite = new CRewriteTG((*it).m_fromSlot, (*it).m_fromTG, (*it).m_toSlot, (*it).m_toTG); m_dmr2NetRewrites.push_back(netRewrite); m_dmr2RFRewrites.push_back(rfRewrite); @@ -782,8 +782,8 @@ bool CDMRGateway::createXLXNetwork() LogInfo(" Slot: %u", m_xlxSlot); LogInfo(" TG: %u", m_xlxTG); - m_rptRewrite = new CRewrite(XLX_SLOT, XLX_TG, m_xlxSlot, m_xlxTG); - m_xlxRewrite = new CRewrite(m_xlxSlot, m_xlxTG, XLX_SLOT, XLX_TG); + m_rptRewrite = new CRewriteTG(XLX_SLOT, XLX_TG, m_xlxSlot, m_xlxTG); + m_xlxRewrite = new CRewriteTG(m_xlxSlot, m_xlxTG, XLX_SLOT, XLX_TG); return true; } diff --git a/DMRGateway.h b/DMRGateway.h index 02a03a8..61f4fa7 100644 --- a/DMRGateway.h +++ b/DMRGateway.h @@ -22,7 +22,7 @@ #include "RepeaterProtocol.h" #include "MMDVMNetwork.h" #include "DMRNetwork.h" -#include "Rewrite.h" +#include "RewriteTG.h" #include "Conf.h" #include @@ -44,12 +44,12 @@ private: unsigned int m_reflector; unsigned int m_xlxSlot; unsigned int m_xlxTG; - CRewrite* m_rptRewrite; - CRewrite* m_xlxRewrite; - std::vector m_dmr1NetRewrites; - std::vector m_dmr1RFRewrites; - std::vector m_dmr2NetRewrites; - std::vector m_dmr2RFRewrites; + CRewriteTG* m_rptRewrite; + CRewriteTG* m_xlxRewrite; + std::vector m_dmr1NetRewrites; + std::vector m_dmr1RFRewrites; + std::vector m_dmr2NetRewrites; + std::vector m_dmr2RFRewrites; bool m_dmr1PrivateSlot1; bool m_dmr1PrivateSlot2; bool m_dmr2PrivateSlot1; diff --git a/DMRGateway.ini b/DMRGateway.ini index 63d0ef5..b8f0f87 100644 --- a/DMRGateway.ini +++ b/DMRGateway.ini @@ -35,7 +35,7 @@ Enabled=1 Address=44.131.4.1 Port=62031 # Local=3352 -Rewrite=1,9,1,9 +TGRewrite=1,9,1,9 PrivateSlot1=1 PrivateSlot2=1 Password=PASSWORD @@ -46,7 +46,7 @@ Enabled=0 Address=44.131.4.1 Port=62031 # Local=3352 -Rewrite=2,9,2,9 +TGRewrite=2,9,2,9 PrivateSlot1=0 PrivateSlot2=0 Password=PASSWORD diff --git a/DMRGateway.vcxproj b/DMRGateway.vcxproj index 7eb59db..db8ce43 100644 --- a/DMRGateway.vcxproj +++ b/DMRGateway.vcxproj @@ -164,7 +164,7 @@ - + @@ -195,7 +195,7 @@ - + diff --git a/DMRGateway.vcxproj.filters b/DMRGateway.vcxproj.filters index 1bd54a4..24f3a52 100644 --- a/DMRGateway.vcxproj.filters +++ b/DMRGateway.vcxproj.filters @@ -56,9 +56,6 @@ Header Files - - Header Files - Header Files @@ -101,6 +98,9 @@ Header Files + + Header Files + @@ -139,9 +139,6 @@ Source Files - - Source Files - Source Files @@ -184,5 +181,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/Makefile b/Makefile index 8a1cf89..f3e38f5 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ LIBS = -lpthread LDFLAGS = -g OBJECTS = BPTC19696.o Conf.o CRC.o DMRData.o DMREmbeddedData.o DMREMB.o DMRFullLC.o DMRGateway.o DMRLC.o DMRNetwork.o DMRSlotType.o Golay2087.o Hamming.o Log.o \ - MMDVMNetwork.o QR1676.o RepeaterProtocol.o Rewrite.o RS129.o SHA256.o StopWatch.o Sync.o Thread.o Timer.o UDPSocket.o Utils.o Voice.o + MMDVMNetwork.o QR1676.o RepeaterProtocol.o RewriteTG.o RS129.o SHA256.o StopWatch.o Sync.o Thread.o Timer.o UDPSocket.o Utils.o Voice.o all: DMRGateway diff --git a/Rewrite.cpp b/RewriteTG.cpp similarity index 87% rename from Rewrite.cpp rename to RewriteTG.cpp index 7408f2a..3185037 100644 --- a/Rewrite.cpp +++ b/RewriteTG.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Rewrite.h" +#include "RewriteTG.h" #include "DMRDefines.h" #include "DMRFullLC.h" @@ -24,7 +24,7 @@ #include #include -CRewrite::CRewrite(unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toTG) : +CRewriteTG::CRewriteTG(unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toTG) : m_fromSlot(fromSlot), m_fromTG(fromTG), m_toSlot(toSlot), @@ -36,11 +36,11 @@ m_embeddedLC() assert(toSlot == 1U || toSlot == 2U); } -CRewrite::~CRewrite() +CRewriteTG::~CRewriteTG() { } -bool CRewrite::process(CDMRData& data) +bool CRewriteTG::process(CDMRData& data) { FLCO flco = data.getFLCO(); unsigned int dstId = data.getDstId(); @@ -77,7 +77,7 @@ bool CRewrite::process(CDMRData& data) return true; } -void CRewrite::processHeader(CDMRData& data, unsigned char dataType) +void CRewriteTG::processHeader(CDMRData& data, unsigned char dataType) { unsigned int srcId = data.getSrcId(); if (srcId != m_lc.getSrcId()) { @@ -94,7 +94,7 @@ void CRewrite::processHeader(CDMRData& data, unsigned char dataType) data.setData(buffer); } -void CRewrite::processVoice(CDMRData& data) +void CRewriteTG::processVoice(CDMRData& data) { unsigned int srcId = data.getSrcId(); if (srcId != m_lc.getSrcId()) { diff --git a/Rewrite.h b/RewriteTG.h similarity index 86% rename from Rewrite.h rename to RewriteTG.h index 486338f..88358d2 100644 --- a/Rewrite.h +++ b/RewriteTG.h @@ -16,17 +16,17 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if !defined(REWRITE_H) -#define REWRITE_H +#if !defined(REWRITETG_H) +#define REWRITETG_H #include "DMREmbeddedData.h" #include "DMRData.h" #include "DMRLC.h" -class CRewrite { +class CRewriteTG { public: - CRewrite(unsigned int fromSLot, unsigned int fromTG, unsigned int toSlot, unsigned int toTG); - ~CRewrite(); + CRewriteTG(unsigned int fromSLot, unsigned int fromTG, unsigned int toSlot, unsigned int toTG); + ~CRewriteTG(); bool process(CDMRData& data);