Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dmr_failover

Browse source
This commit is contained in:
Jonathan Naylor 2017-04-11 19:33:34 +01:00
parent d80653f293 0fe100b01c
commit e1b5194ac4
4 changed files with 90 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
Conf.cpp
View file

@ -306,14 +306,13 @@ bool CConf::read()
m_cwIdEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Time") == 0)
m_cwIdTime = (unsigned int)::atoi(value);
else if (::strcmp(key, "Callsign") == 0) {
// Convert the callsign to upper case
for (unsigned int i = 0U; value[i] != 0; i++)
value[i] = ::toupper(value[i]);
m_cwIdCallsign = value;
}
}
else if (section == SECTION_DMRID_LOOKUP) {
else if (::strcmp(key, "Callsign") == 0) {
// Convert the callsign to upper case
for (unsigned int i = 0U; value[i] != 0; i++)
value[i] = ::toupper(value[i]);
m_cwIdCallsign = value;
}
} else if (section == SECTION_DMRID_LOOKUP) {
if (::strcmp(key, "File") == 0)
m_dmrIdLookupFile = value;
else if (::strcmp(key, "Time") == 0)
@ -465,25 +464,25 @@ bool CConf::read()
} else if (section == SECTION_DMR_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_dmrNetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Failover") == 0)
m_dmrNetworkFailover = ::atoi(value) == 1;
else if (::strcmp(key, "Address") == 0 || ::strcmp(key, "PrimaryAddress") == 0)
else if (::strcmp(key, "Failover") == 0)
m_dmrNetworkFailover = ::atoi(value) == 1;
else if (::strcmp(key, "Address") == 0 || ::strcmp(key, "PrimaryAddress") == 0)
m_dmrNetworkPrimaryAddress = value;
else if (::strcmp(key, "Port") == 0 || ::strcmp(key, "PrimaryPort") == 0)
else if (::strcmp(key, "Port") == 0 || ::strcmp(key, "PrimaryPort") == 0)
m_dmrNetworkPrimaryPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "Local") == 0 || ::strcmp(key, "PrimaryLocal") == 0)
else if (::strcmp(key, "Local") == 0 || ::strcmp(key, "PrimaryLocal") == 0)
m_dmrNetworkPrimaryLocal = (unsigned int)::atoi(value);
else if (::strcmp(key, "Password") == 0 || ::strcmp(key, "PrimaryPassword") == 0)
else if (::strcmp(key, "Password") == 0 || ::strcmp(key, "PrimaryPassword") == 0)
m_dmrNetworkPrimaryPassword = value;
else if (::strcmp(key, "SecondaryAddress") == 0)
m_dmrNetworkSecondaryAddress = value;
else if (::strcmp(key, "SecondaryPort") == 0)
m_dmrNetworkSecondaryPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "SecondaryLocal") == 0)
m_dmrNetworkSecondaryLocal = (unsigned int)::atoi(value);
else if (::strcmp(key, "SecondaryPassword") == 0)
m_dmrNetworkSecondaryPassword = value;
else if (::strcmp(key, "Options") == 0)
else if (::strcmp(key, "SecondaryAddress") == 0)
m_dmrNetworkSecondaryAddress = value;
else if (::strcmp(key, "SecondaryPort") == 0)
m_dmrNetworkSecondaryPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "SecondaryLocal") == 0)
m_dmrNetworkSecondaryLocal = (unsigned int)::atoi(value);
else if (::strcmp(key, "SecondaryPassword") == 0)
m_dmrNetworkSecondaryPassword = value;
else if (::strcmp(key, "Options") == 0)
m_dmrNetworkOptions = value;
else if (::strcmp(key, "Debug") == 0)
m_dmrNetworkDebug = ::atoi(value) == 1;
@ -590,22 +589,22 @@ bool CConf::read()
std::string CConf::getCallsign() const
{
return m_callsign;
return m_callsign;
}
unsigned int CConf::getTimeout() const
{
return m_timeout;
return m_timeout;
}
bool CConf::getDuplex() const
{
return m_duplex;
return m_duplex;
}
unsigned int CConf::getRFModeHang() const
{
return m_rfModeHang;
return m_rfModeHang;
}
unsigned int CConf::getNetModeHang() const
@ -615,7 +614,7 @@ unsigned int CConf::getNetModeHang() const
std::string CConf::getDisplay() const
{
return m_display;
return m_display;
}
bool CConf::getDaemon() const
@ -680,12 +679,12 @@ unsigned int CConf::getLogFileLevel() const
std::string CConf::getLogFilePath() const
{
return m_logFilePath;
return m_logFilePath;
}
std::string CConf::getLogFileRoot() const
{
return m_logFileRoot;
return m_logFileRoot;
}
bool CConf::getCWIdEnabled() const
@ -700,7 +699,7 @@ unsigned int CConf::getCWIdTime() const
std::string CConf::getCWIdCallsign() const
{
return m_cwIdCallsign;
return m_cwIdCallsign;
}
std::string CConf::getDMRIdLookupFile() const
@ -920,17 +919,17 @@ bool CConf::getDStarNetworkEnabled() const
std::string CConf::getDStarGatewayAddress() const
{
return m_dstarGatewayAddress;
return m_dstarGatewayAddress;
}
unsigned int CConf::getDStarGatewayPort() const
{
return m_dstarGatewayPort;
return m_dstarGatewayPort;
}
unsigned int CConf::getDStarLocalPort() const
{
return m_dstarLocalPort;
return m_dstarLocalPort;
}
bool CConf::getDStarNetworkDebug() const
@ -945,47 +944,47 @@ bool CConf::getDMRNetworkEnabled() const
bool CConf::getDMRNetworkFailover() const
{
return m_dmrNetworkFailover;
return m_dmrNetworkFailover;
}
std::string CConf::getDMRNetworkPrimaryAddress() const
{
return m_dmrNetworkPrimaryAddress;
return m_dmrNetworkPrimaryAddress;
}
unsigned int CConf::getDMRNetworkPrimaryPort() const
{
return m_dmrNetworkPrimaryPort;
return m_dmrNetworkPrimaryPort;
}
unsigned int CConf::getDMRNetworkPrimaryLocal() const
{
return m_dmrNetworkPrimaryLocal;
return m_dmrNetworkPrimaryLocal;
}
std::string CConf::getDMRNetworkPrimaryPassword() const
{
return m_dmrNetworkPrimaryPassword;
return m_dmrNetworkPrimaryPassword;
}
std::string CConf::getDMRNetworkSecondaryAddress() const
{
return m_dmrNetworkSecondaryAddress;
return m_dmrNetworkSecondaryAddress;
}
unsigned int CConf::getDMRNetworkSecondaryPort() const
{
return m_dmrNetworkSecondaryPort;
return m_dmrNetworkSecondaryPort;
}
unsigned int CConf::getDMRNetworkSecondaryLocal() const
{
return m_dmrNetworkSecondaryLocal;
return m_dmrNetworkSecondaryLocal;
}
std::string CConf::getDMRNetworkSecondaryPassword() const
{
return m_dmrNetworkSecondaryPassword;
return m_dmrNetworkSecondaryPassword;
}
std::string CConf::getDMRNetworkOptions() const
@ -1030,12 +1029,12 @@ unsigned int CConf::getFusionNetworkMyPort() const
std::string CConf::getFusionNetworkGwyAddress() const
{
return m_fusionNetworkGwyAddress;
return m_fusionNetworkGwyAddress;
}
unsigned int CConf::getFusionNetworkGwyPort() const
{
return m_fusionNetworkGwyPort;
return m_fusionNetworkGwyPort;
}
bool CConf::getFusionNetworkDebug() const
@ -1075,7 +1074,7 @@ bool CConf::getP25OverrideUID() const
std::string CConf::getTFTSerialPort() const
{
return m_tftSerialPort;
return m_tftSerialPort;
}
unsigned int CConf::getTFTSerialBrightness() const

2
DMRNetwork.cpp
View file

@ -576,5 +576,5 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
bool CDMRNetwork::isRunning() const
{
return m_status == RUNNING;
return m_status == RUNNING;
}

2
DMRNetwork.h
View file

@ -72,7 +72,7 @@ public:
virtual bool wantsBeacon();
virtual bool isRunning() const;
virtual bool isRunning() const;
virtual void clock(unsigned int ms);

86
MMDVMHost.cpp
View file

@ -289,11 +289,11 @@ int CMMDVMHost::run()
if (m_conf.getCWIdEnabled()) {
unsigned int time = m_conf.getCWIdTime();
m_cwCallsign = m_conf.getCWIdCallsign();
m_cwCallsign = m_conf.getCWIdCallsign();
LogInfo("CW Id Parameters");
LogInfo(" Time: %u mins", time);
LogInfo(" Callsign: %s", m_cwCallsign.c_str());
LogInfo(" Callsign: %s", m_cwCallsign.c_str());
m_cwIdTime = time * 60U;
@ -875,60 +875,60 @@ bool CMMDVMHost::createDStarNetwork()
bool CMMDVMHost::createDMRNetwork()
{
std::string primaryAddress = m_conf.getDMRNetworkPrimaryAddress();
bool failover = m_conf.getDMRNetworkFailover();
unsigned int primaryPort = m_conf.getDMRNetworkPrimaryPort();
unsigned int primaryLocal = m_conf.getDMRNetworkPrimaryLocal();
std::string primaryPassword = m_conf.getDMRNetworkPrimaryPassword();
std::string secondaryAddress = m_conf.getDMRNetworkSecondaryAddress();
unsigned int secondaryPort = m_conf.getDMRNetworkSecondaryPort();
unsigned int secondaryLocal = m_conf.getDMRNetworkSecondaryLocal();
std::string secondaryPassword = m_conf.getDMRNetworkSecondaryPassword();
unsigned int id = m_conf.getDMRId();
bool debug = m_conf.getDMRNetworkDebug();
bool failover = m_conf.getDMRNetworkFailover();
unsigned int primaryPort = m_conf.getDMRNetworkPrimaryPort();
unsigned int primaryLocal = m_conf.getDMRNetworkPrimaryLocal();
std::string primaryPassword = m_conf.getDMRNetworkPrimaryPassword();
std::string secondaryAddress = m_conf.getDMRNetworkSecondaryAddress();
unsigned int secondaryPort = m_conf.getDMRNetworkSecondaryPort();
unsigned int secondaryLocal = m_conf.getDMRNetworkSecondaryLocal();
std::string secondaryPassword = m_conf.getDMRNetworkSecondaryPassword();
unsigned int id = m_conf.getDMRId();
bool debug = m_conf.getDMRNetworkDebug();
unsigned int jitter = m_conf.getDMRNetworkJitter();
bool slot1 = m_conf.getDMRNetworkSlot1();
bool slot2 = m_conf.getDMRNetworkSlot2();
HW_TYPE hwType = m_modem->getHWType();
LogInfo("DMR Network Parameters");
if (failover) {
LogInfo(" Failover: yes");
if (failover) {
LogInfo(" Failover: yes");
LogInfo(" Primary Address: %s", primaryAddress.c_str());
LogInfo(" Primary Port: %u", primaryPort);
if (primaryLocal > 0U)
LogInfo(" Primary Local: %u", primaryLocal);
else
LogInfo(" Primary Local: random");
LogInfo(" Primary Address: %s", primaryAddress.c_str());
LogInfo(" Primary Port: %u", primaryPort);
if (primaryLocal > 0U)
LogInfo(" Primary Local: %u", primaryLocal);
else
LogInfo(" Primary Local: random");
LogInfo(" Secondary Address: %s", secondaryAddress.c_str());
LogInfo(" Secondary Port: %u", secondaryPort);
if (secondaryLocal > 0U)
LogInfo(" Secondary Local: %u", secondaryLocal);
else
LogInfo(" Secondary Local: random");
} else {
LogInfo(" Failover: no");
LogInfo(" Address: %s", primaryAddress.c_str());
LogInfo(" Port: %u", primaryPort);
if (primaryLocal > 0U)
LogInfo(" Local: %u", primaryLocal);
else
LogInfo(" Local: random");
}
LogInfo(" Secondary Address: %s", secondaryAddress.c_str());
LogInfo(" Secondary Port: %u", secondaryPort);
if (secondaryLocal > 0U)
LogInfo(" Secondary Local: %u", secondaryLocal);
else
LogInfo(" Secondary Local: random");
} else {
LogInfo(" Failover: no");
LogInfo(" Address: %s", primaryAddress.c_str());
LogInfo(" Port: %u", primaryPort);
if (primaryLocal > 0U)
LogInfo(" Local: %u", primaryLocal);
else
LogInfo(" Local: random");
}
LogInfo(" Jitter: %ums", jitter);
LogInfo(" Jitter: %ums", jitter);
LogInfo(" Slot 1: %s", slot1 ? "enabled" : "disabled");
LogInfo(" Slot 2: %s", slot2 ? "enabled" : "disabled");
if (failover) {
CDMRNetwork* primary = new CDMRNetwork(primaryAddress, primaryPort, primaryLocal, id, primaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
CDMRNetwork* secondary = new CDMRNetwork(secondaryAddress, secondaryPort, secondaryLocal, id, secondaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
if (failover) {
CDMRNetwork* primary = new CDMRNetwork(primaryAddress, primaryPort, primaryLocal, id, primaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
CDMRNetwork* secondary = new CDMRNetwork(secondaryAddress, secondaryPort, secondaryLocal, id, secondaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
m_dmrNetwork = new CDMRNetworkManager(primary, secondary);
} else {
m_dmrNetwork = new CDMRNetwork(primaryAddress, primaryPort, primaryLocal, id, primaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
}
m_dmrNetwork = new CDMRNetworkManager(primary, secondary);
} else {
m_dmrNetwork = new CDMRNetwork(primaryAddress, primaryPort, primaryLocal, id, primaryPassword, m_duplex, VERSION, debug, slot1, slot2, hwType);
}
std::string options = m_conf.getDMRNetworkOptions();
if (!options.empty()) {