Merge branch 'master' into GPS

This commit is contained in:
Jonathan Naylor
2017-06-10 11:57:17 +01:00
22 changed files with 299 additions and 145 deletions

View File

@@ -47,6 +47,7 @@ m_rptPort(62032U),
m_localAddress("127.0.0.1"),
m_localPort(62031U),
m_timeout(10U),
m_ruleTrace(false),
m_debug(false),
m_voiceEnabled(true),
m_voiceLanguage("en_GB"),
@@ -191,6 +192,8 @@ bool CConf::read()
m_localAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_localPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "RuleTrace") == 0)
m_ruleTrace = ::atoi(value) == 1;
else if (::strcmp(key, "Debug") == 0)
m_debug = ::atoi(value) == 1;
} else if (section == SECTION_LOG) {
@@ -486,6 +489,11 @@ unsigned int CConf::getTimeout() const
return m_timeout;
}
bool CConf::getRuleTrace() const
{
return m_ruleTrace;
}
bool CConf::getDebug() const
{
return m_debug;