Merge branch 'master' into IPv6

This commit is contained in:
Jonathan Naylor 2020-09-05 22:17:07 +01:00
commit 91f04abddb
8 changed files with 55 additions and 5 deletions

View file

@ -70,6 +70,7 @@ m_aprsPort(0U),
m_aprsSuffix(),
m_aprsDescription(),
m_networkStartup(),
m_networkOptions(),
m_networkInactivityTimeout(0U),
m_networkRevert(false),
m_networkDebug(false),
@ -234,6 +235,8 @@ bool CConf::read()
} else if (section == SECTION_NETWORK) {
if (::strcmp(key, "Startup") == 0)
m_networkStartup = value;
else if (::strcmp(key, "Options") == 0)
m_networkOptions = value;
else if (::strcmp(key, "InactivityTimeout") == 0)
m_networkInactivityTimeout = (unsigned int)::atoi(value);
else if (::strcmp(key, "Revert") == 0)
@ -399,12 +402,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::getAPRSEnabled() const
@ -437,6 +440,11 @@ std::string CConf::getNetworkStartup() const
return m_networkStartup;
}
std::string CConf::getNetworkOptions() const
{
return m_networkOptions;
}
unsigned int CConf::getNetworkInactivityTimeout() const
{
return m_networkInactivityTimeout;
@ -459,7 +467,7 @@ bool CConf::getYSFNetworkEnabled() const
unsigned int CConf::getYSFNetworkPort() const
{
return m_ysfNetworkPort;
return m_ysfNetworkPort;
}
std::string CConf::getYSFNetworkHosts() const