diff --git a/Conf.cpp b/Conf.cpp index fbfd217..ae966a8 100644 --- a/Conf.cpp +++ b/Conf.cpp @@ -308,6 +308,38 @@ bool CConf::read() m_dmrBlackList.push_back(id); p = ::strtok(NULL, ",\r\n"); } + } else if (::strcmp(key, "DstIdBlackListSlot1") == 0) { + char* p = ::strtok(value, ",\r\n"); + while (p != NULL) { + unsigned int id = (unsigned int)::atoi(p); + if (id > 0U) + m_dmrDstIdBlacklistSlot1.push_back(id); + p = ::strtok(NULL, ",\r\n"); + } + } else if (::strcmp(key, "DstIdBlackListSlot2") == 0) { + char* p = ::strtok(value, ",\r\n"); + while (p != NULL) { + unsigned int id = (unsigned int)::atoi(p); + if (id > 0U) + m_dmrDstIdBlacklistSlot2.push_back(id); + p = ::strtok(NULL, ",\r\n"); + } + } else if (::strcmp(key, "DstIdWhiteListSlot1") == 0) { + char* p = ::strtok(value, ",\r\n"); + while (p != NULL) { + unsigned int id = (unsigned int)::atoi(p); + if (id > 0U) + m_dmrDstIdWhitelistSlot1.push_back(id); + p = ::strtok(NULL, ",\r\n"); + } + } else if (::strcmp(key, "DstIdWhiteListSlot2") == 0) { + char* p = ::strtok(value, ",\r\n"); + while (p != NULL) { + unsigned int id = (unsigned int)::atoi(p); + if (id > 0U) + m_dmrDstIdWhitelistSlot2.push_back(id); + p = ::strtok(NULL, ",\r\n"); + } } else if (::strcmp(key, "LookupFile") == 0) m_dmrLookupFile = value; else if (::strcmp(key, "TXHang") == 0) @@ -608,7 +640,21 @@ std::vector CConf::getDMRBlackList() const { return m_dmrBlackList; } - +std::vector CConf::getDMRDstIdBlacklistSlot1() const +{ + return m_dmrDstIdBlacklistSlot1; +} +std::vector CConf::getDMRDstIdBlacklistSlot2() const +{ + return m_dmrDstIdBlacklistSlot2; +} +std::vector CConf::getDMRDstIdWhitelistSlot1() const +{ + return m_dmrDstIdWhitelistSlot1; +}std::vector CConf::getDMRDstIdWhitelistSlot2() const +{ + return m_dmrDstIdWhitelistSlot2; +} std::string CConf::getDMRLookupFile() const { return m_dmrLookupFile;