MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into M17_AX25_FM

Browse Source
This commit is contained in:
Jonathan Naylor
2020-12-06 16:46:10 +00:00
parent ef9fedcc01 136deac61a
commit ef6056506c
26 changed files with 1871 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Conf.cpp
View File

@@ -227,6 +227,7 @@ m_dstarLocalPort(0U),
m_dstarNetworkModeHang(3U),
m_dstarNetworkDebug(false),
m_dmrNetworkEnabled(false),
m_dmrNetworkType("Gateway"),
m_dmrNetworkAddress(),
m_dmrNetworkPort(0U),
m_dmrNetworkLocal(0U),
@@ -868,6 +869,8 @@ bool CConf::read()
} else if (section == SECTION_DMR_NETWORK) {
if (::strcmp(key, "Enable") == 0)
m_dmrNetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Type") == 0)
m_dmrNetworkType = value;
else if (::strcmp(key, "Address") == 0)
m_dmrNetworkAddress = value;
else if (::strcmp(key, "Port") == 0)
@@ -1881,6 +1884,11 @@ bool CConf::getDMRNetworkEnabled() const
return m_dmrNetworkEnabled;
}
std::string CConf::getDMRNetworkType() const
{
return m_dmrNetworkType;
}
std::string CConf::getDMRNetworkAddress() const
{
return m_dmrNetworkAddress;