Merge branch 'master' into AX25

This commit is contained in:
Jonathan Naylor
2020-06-17 15:48:20 +01:00
27 changed files with 1721 additions and 243 deletions

View File

@@ -239,6 +239,7 @@ m_p25LocalPort(0U),
m_p25NetworkModeHang(3U),
m_p25NetworkDebug(false),
m_nxdnNetworkEnabled(false),
m_nxdnNetworkProtocol("Icom"),
m_nxdnGatewayAddress(),
m_nxdnGatewayPort(0U),
m_nxdnLocalAddress(),
@@ -857,6 +858,8 @@ bool CConf::read()
} else if (section == SECTION_NXDN_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_nxdnNetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Protocol") == 0)
m_nxdnNetworkProtocol = value;
else if (::strcmp(key, "LocalAddress") == 0)
m_nxdnLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
@@ -1865,6 +1868,11 @@ bool CConf::getNXDNNetworkEnabled() const
return m_nxdnNetworkEnabled;
}
std::string CConf::getNXDNNetworkProtocol() const
{
return m_nxdnNetworkProtocol;
}
std::string CConf::getNXDNGatewayAddress() const
{
return m_nxdnGatewayAddress;