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

Add ranges to dynamic rewrite exclusion private calls/talk groups.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-05-03 22:24:37 +01:00
parent 8e75b2453b
commit d0ceb64163
6 changed files with 73 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Conf.cpp
View File

@@ -432,8 +432,16 @@ bool CConf::read()
rewrite.m_toTG = ::atoi(p5);
rewrite.m_range = ::atoi(p6);
for (std::vector<char*>::const_iterator it = p7.cbegin(); it != p7.cend(); ++it) {
unsigned int tg = ::atoi(*it);
rewrite.m_exclTGs.push_back(tg);
const char* exclusion = *it;
const char* p = NULL;
if ((p = ::strchr(exclusion, '-')) != NULL) {
unsigned int tgstart = (unsigned int)::atoi(exclusion);
unsigned int tgend = (unsigned int)::atoi(p + 1U);
rewrite.m_exclTGs.push_back(std::make_pair(tgstart, tgend));
} else {
unsigned int tg = (unsigned int)::atoi(*it);
rewrite.m_exclTGs.push_back(std::make_pair(tg, tg));
}
}
m_dmrNetwork1TGDynRewrites.push_back(rewrite);
}
@@ -554,8 +562,16 @@ bool CConf::read()
rewrite.m_toTG = ::atoi(p5);
rewrite.m_range = ::atoi(p6);
for (std::vector<char*>::const_iterator it = p7.cbegin(); it != p7.cend(); ++it) {
unsigned int tg = ::atoi(*it);
rewrite.m_exclTGs.push_back(tg);
const char* exclusion = *it;
const char* p = NULL;
if ((p = ::strchr(exclusion, '-')) != NULL) {
unsigned int tgstart = (unsigned int)::atoi(exclusion);
unsigned int tgend = (unsigned int)::atoi(p + 1U);
rewrite.m_exclTGs.push_back(std::make_pair(tgstart, tgend));
} else {
unsigned int tg = (unsigned int)::atoi(*it);
rewrite.m_exclTGs.push_back(std::make_pair(tg, tg));
}
}
m_dmrNetwork2TGDynRewrites.push_back(rewrite);
}
@@ -676,8 +692,16 @@ bool CConf::read()
rewrite.m_toTG = ::atoi(p5);
rewrite.m_range = ::atoi(p6);
for (std::vector<char*>::const_iterator it = p7.cbegin(); it != p7.cend(); ++it) {
unsigned int tg = ::atoi(*it);
rewrite.m_exclTGs.push_back(tg);
const char* exclusion = *it;
const char* p = NULL;
if ((p = ::strchr(exclusion, '-')) != NULL) {
unsigned int tgstart = (unsigned int)::atoi(exclusion);
unsigned int tgend = (unsigned int)::atoi(p + 1U);
rewrite.m_exclTGs.push_back(std::make_pair(tgstart, tgend));
} else {
unsigned int tg = (unsigned int)::atoi(*it);
rewrite.m_exclTGs.push_back(std::make_pair(tg, tg));
}
}
m_dmrNetwork3TGDynRewrites.push_back(rewrite);
}
@@ -798,8 +822,16 @@ bool CConf::read()
rewrite.m_toTG = ::atoi(p5);
rewrite.m_range = ::atoi(p6);
for (std::vector<char*>::const_iterator it = p7.cbegin(); it != p7.cend(); ++it) {
unsigned int tg = ::atoi(*it);
rewrite.m_exclTGs.push_back(tg);
const char* exclusion = *it;
const char* p = NULL;
if ((p = ::strchr(exclusion, '-')) != NULL) {
unsigned int tgstart = (unsigned int)::atoi(exclusion);
unsigned int tgend = (unsigned int)::atoi(p + 1U);
rewrite.m_exclTGs.push_back(std::make_pair(tgstart, tgend));
} else {
unsigned int tg = (unsigned int)::atoi(*it);
rewrite.m_exclTGs.push_back(std::make_pair(tg, tg));
}
}
m_dmrNetwork4TGDynRewrites.push_back(rewrite);
}
@@ -920,8 +952,16 @@ bool CConf::read()
rewrite.m_toTG = ::atoi(p5);
rewrite.m_range = ::atoi(p6);
for (std::vector<char*>::const_iterator it = p7.cbegin(); it != p7.cend(); ++it) {
unsigned int tg = ::atoi(*it);
rewrite.m_exclTGs.push_back(tg);
const char* exclusion = *it;
const char* p = NULL;
if ((p = ::strchr(exclusion, '-')) != NULL) {
unsigned int tgstart = (unsigned int)::atoi(exclusion);
unsigned int tgend = (unsigned int)::atoi(p + 1U);
rewrite.m_exclTGs.push_back(std::make_pair(tgstart, tgend));
} else {
unsigned int tg = (unsigned int)::atoi(*it);
rewrite.m_exclTGs.push_back(std::make_pair(tg, tg));
}
}
m_dmrNetwork5TGDynRewrites.push_back(rewrite);
}