MMDVM/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway synced 2025-12-21 21:45:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Extended TypeRewrite

Browse Source
This commit is contained in:
John doe
2020-04-08 16:21:35 +09:00
parent efed75f160
commit 3b7083b373
4 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Conf.cpp
View File

@@ -381,13 +381,15 @@ bool CConf::read()
char* p1 = ::strtok(value, ", "); char* p1 = ::strtok(value, ", ");
char* p2 = ::strtok(NULL, ", "); char* p2 = ::strtok(NULL, ", ");
char* p3 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", ");
char* p4 = ::strtok(NULL, " \r\n"); char* p4 = ::strtok(NULL, ", \r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) { if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) {
CTypeRewriteStruct rewrite; CTypeRewriteStruct rewrite;
rewrite.m_fromSlot = ::atoi(p1); rewrite.m_fromSlot = ::atoi(p1);
rewrite.m_fromTG = ::atoi(p2); rewrite.m_fromTG = ::atoi(p2);
rewrite.m_toSlot = ::atoi(p3); rewrite.m_toSlot = ::atoi(p3);
rewrite.m_toId = ::atoi(p4); rewrite.m_toId = ::atoi(p4);
char* p5 = ::strtok(NULL, " \r\n");
rewrite.m_range = p5 != NULL ? ::atoi(p5) : 1;
m_dmrNetwork1TypeRewrites.push_back(rewrite); m_dmrNetwork1TypeRewrites.push_back(rewrite);
} }
} else if (::strncmp(key, "SrcRewrite", 10U) == 0) { } else if (::strncmp(key, "SrcRewrite", 10U) == 0) {
@@ -493,13 +495,15 @@ bool CConf::read()
char* p1 = ::strtok(value, ", "); char* p1 = ::strtok(value, ", ");
char* p2 = ::strtok(NULL, ", "); char* p2 = ::strtok(NULL, ", ");
char* p3 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", ");
char* p4 = ::strtok(NULL, " \r\n"); char* p4 = ::strtok(NULL, ", \r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) { if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) {
CTypeRewriteStruct rewrite; CTypeRewriteStruct rewrite;
rewrite.m_fromSlot = ::atoi(p1); rewrite.m_fromSlot = ::atoi(p1);
rewrite.m_fromTG = ::atoi(p2); rewrite.m_fromTG = ::atoi(p2);
rewrite.m_toSlot = ::atoi(p3); rewrite.m_toSlot = ::atoi(p3);
rewrite.m_toId = ::atoi(p4); rewrite.m_toId = ::atoi(p4);
char* p5 = ::strtok(NULL, " \r\n");
rewrite.m_range = p5 != NULL ? ::atoi(p5) : 1;
m_dmrNetwork2TypeRewrites.push_back(rewrite); m_dmrNetwork2TypeRewrites.push_back(rewrite);
} }
} else if (::strncmp(key, "SrcRewrite", 10U) == 0) { } else if (::strncmp(key, "SrcRewrite", 10U) == 0) {
@@ -605,13 +609,15 @@ bool CConf::read()
char* p1 = ::strtok(value, ", "); char* p1 = ::strtok(value, ", ");
char* p2 = ::strtok(NULL, ", "); char* p2 = ::strtok(NULL, ", ");
char* p3 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", ");
char* p4 = ::strtok(NULL, " \r\n"); char* p4 = ::strtok(NULL, ", \r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) { if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) {
CTypeRewriteStruct rewrite; CTypeRewriteStruct rewrite;
rewrite.m_fromSlot = ::atoi(p1); rewrite.m_fromSlot = ::atoi(p1);
rewrite.m_fromTG = ::atoi(p2); rewrite.m_fromTG = ::atoi(p2);
rewrite.m_toSlot = ::atoi(p3); rewrite.m_toSlot = ::atoi(p3);
rewrite.m_toId = ::atoi(p4); rewrite.m_toId = ::atoi(p4);
char* p5 = ::strtok(NULL, " \r\n");
rewrite.m_range = p5 != NULL ? ::atoi(p5) : 1;
m_dmrNetwork3TypeRewrites.push_back(rewrite); m_dmrNetwork3TypeRewrites.push_back(rewrite);
} }
} else if (::strncmp(key, "SrcRewrite", 10U) == 0) { } else if (::strncmp(key, "SrcRewrite", 10U) == 0) {
@@ -717,13 +723,15 @@ bool CConf::read()
char* p1 = ::strtok(value, ", "); char* p1 = ::strtok(value, ", ");
char* p2 = ::strtok(NULL, ", "); char* p2 = ::strtok(NULL, ", ");
char* p3 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", ");
char* p4 = ::strtok(NULL, " \r\n"); char* p4 = ::strtok(NULL, ", \r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) { if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) {
CTypeRewriteStruct rewrite; CTypeRewriteStruct rewrite;
rewrite.m_fromSlot = ::atoi(p1); rewrite.m_fromSlot = ::atoi(p1);
rewrite.m_fromTG = ::atoi(p2); rewrite.m_fromTG = ::atoi(p2);
rewrite.m_toSlot = ::atoi(p3); rewrite.m_toSlot = ::atoi(p3);
rewrite.m_toId = ::atoi(p4); rewrite.m_toId = ::atoi(p4);
char* p5 = ::strtok(NULL, " \r\n");
rewrite.m_range = p5 != NULL ? ::atoi(p5) : 1;
m_dmrNetwork4TypeRewrites.push_back(rewrite); m_dmrNetwork4TypeRewrites.push_back(rewrite);
} }
} else if (::strncmp(key, "SrcRewrite", 10U) == 0) { } else if (::strncmp(key, "SrcRewrite", 10U) == 0) {
@@ -829,13 +837,15 @@ bool CConf::read()
char* p1 = ::strtok(value, ", "); char* p1 = ::strtok(value, ", ");
char* p2 = ::strtok(NULL, ", "); char* p2 = ::strtok(NULL, ", ");
char* p3 = ::strtok(NULL, ", "); char* p3 = ::strtok(NULL, ", ");
char* p4 = ::strtok(NULL, " \r\n"); char* p4 = ::strtok(NULL, ", \r\n");
if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) { if (p1 != NULL && p2 != NULL && p3 != NULL && p4 != NULL) {
CTypeRewriteStruct rewrite; CTypeRewriteStruct rewrite;
rewrite.m_fromSlot = ::atoi(p1); rewrite.m_fromSlot = ::atoi(p1);
rewrite.m_fromTG = ::atoi(p2); rewrite.m_fromTG = ::atoi(p2);
rewrite.m_toSlot = ::atoi(p3); rewrite.m_toSlot = ::atoi(p3);
rewrite.m_toId = ::atoi(p4); rewrite.m_toId = ::atoi(p4);
char* p5 = ::strtok(NULL, " \r\n");
rewrite.m_range = p5 != NULL ? ::atoi(p5) : 1;
m_dmrNetwork5TypeRewrites.push_back(rewrite); m_dmrNetwork5TypeRewrites.push_back(rewrite);
} }
} else if (::strncmp(key, "SrcRewrite", 10U) == 0) { } else if (::strncmp(key, "SrcRewrite", 10U) == 0) {

1
Conf.h
View File

@@ -43,6 +43,7 @@ struct CTypeRewriteStruct {
unsigned int m_fromTG; unsigned int m_fromTG;
unsigned int m_toSlot; unsigned int m_toSlot;
unsigned int m_toId; unsigned int m_toId;
unsigned int m_range;
}; };
struct CSrcRewriteStruct { struct CSrcRewriteStruct {

37
RewriteType.cpp
View File

@@ -24,13 +24,15 @@
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
CRewriteType::CRewriteType(const std::string& name, unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toId) : CRewriteType::CRewriteType(const std::string& name, unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toId, unsigned int range) :
CRewrite(), CRewrite(),
m_name(name), m_name(name),
m_fromSlot(fromSlot), m_fromSlot(fromSlot),
m_fromTG(fromTG), m_fromTGStart(fromTG),
m_fromTGEnd(fromTG + range - 1U),
m_toSlot(toSlot), m_toSlot(toSlot),
m_toId(toId) m_toIdStart(toId),
m_toIdEnd(toId + range - 1U)
{ {
assert(fromSlot == 1U || fromSlot == 2U); assert(fromSlot == 1U || fromSlot == 2U);
assert(toSlot == 1U || toSlot == 2U); assert(toSlot == 1U || toSlot == 2U);
@@ -46,23 +48,38 @@ PROCESS_RESULT CRewriteType::process(CDMRData& data, bool trace)
unsigned int dstId = data.getDstId(); unsigned int dstId = data.getDstId();
unsigned int slotNo = data.getSlotNo(); unsigned int slotNo = data.getSlotNo();
if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId != m_fromTG) { if (flco != FLCO_GROUP || slotNo != m_fromSlot || dstId < m_fromTGStart || dstId > m_fromTGEnd) {
if (trace) if (trace) {
LogDebug("Rule Trace,\tRewriteType %s Slot=%u Dst=TG%u: not matched", m_name.c_str(), m_fromSlot, m_fromTG); if (m_fromTGStart == m_fromTGEnd)
LogDebug("Rule Trace,\tRewriteType from \"%s\" Slot=%u Dst=TG%u: not matched", m_name.c_str(), m_fromSlot, m_fromTGStart);
else
LogDebug("Rule Trace,\tRewriteType from \"%s\" Slot=%u Dst=TG%u-%u: not matched", m_name.c_str(), m_fromSlot, m_fromTGStart, m_fromTGEnd);
}
return RESULT_UNMATCHED; return RESULT_UNMATCHED;
} }
if (m_fromSlot != m_toSlot) if (m_fromSlot != m_toSlot)
data.setSlotNo(m_toSlot); data.setSlotNo(m_toSlot);
data.setDstId(m_toId); if (m_fromTGStart != m_fromTGEnd) {
unsigned int newDstId = dstId + m_toIdStart - m_fromTGStart;
data.setDstId(newDstId);
} else
data.setDstId(toId);
data.setFLCO(FLCO_USER_USER); data.setFLCO(FLCO_USER_USER);
processMessage(data); processMessage(data);
if (trace) if (trace) {
LogDebug("Rule Trace,\tRewriteType %s Slot=%u Dst=TG%u: matched", m_name.c_str(), m_fromSlot, m_fromTG); if (m_fromTGStart == m_fromTGEnd)
LogDebug("Rule Trace,\tRewriteType to \"\s\" Slot=%u Dst=%u: matched", m_name.c_str(), m_fromSlot, m_fromTGStart);
else
LogDebug("Rule Trace,\tRewriteType to \"\s\" Slot=%u Dst=%u-%u: matched", m_name.c_str(), m_fromSlot, m_fromTGStart, m_fromTGEnd);
if (m_toIdStart == m_toIdEnd)
LogDebug("Rule Trace,\tRewriteType to \"\s\" Slot=%u Dst=%u: matched", m_name.c_str(), m_toSlot, m_toIdStart);
else
LogDebug("Rule Trace,\tRewriteType to \"\s\" Slot=%u Dst=%u-%u: matched", m_name.c_str(), m_toSlot, m_toIdStart, m_toIdTGEnd);
}
return RESULT_MATCHED; return RESULT_MATCHED;
} }

8
RewriteType.h
View File

@@ -26,7 +26,7 @@
class CRewriteType : public CRewrite { class CRewriteType : public CRewrite {
public: public:
CRewriteType(const std::string& name, unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toId); CRewriteType(const std::string& name, unsigned int fromSlot, unsigned int fromTG, unsigned int toSlot, unsigned int toId, unsigned int range);
virtual ~CRewriteType(); virtual ~CRewriteType();
virtual PROCESS_RESULT process(CDMRData& data, bool trace); virtual PROCESS_RESULT process(CDMRData& data, bool trace);
@@ -34,9 +34,11 @@ public:
private: private:
std::string m_name; std::string m_name;
unsigned int m_fromSlot; unsigned int m_fromSlot;
unsigned int m_fromTG; unsigned int m_fromTGStart;
unsigned int m_fromTGEnd;
unsigned int m_toSlot; unsigned int m_toSlot;
unsigned int m_toId; unsigned int m_toIdStart;
unsigned int m_toIdEnd;
}; };