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

Remove the direct network access to DMR Masters.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-06-05 17:30:39 +01:00
parent 0ecf2dec39
commit 391e382a7b
23 changed files with 519 additions and 1457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Conf.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2015-2022 by Jonathan Naylor G4KLX
* Copyright (C) 2015-2022,2023 by Jonathan Naylor G4KLX
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -246,13 +246,10 @@ m_dstarLocalPort(0U),
m_dstarNetworkModeHang(3U),
m_dstarNetworkDebug(false),
m_dmrNetworkEnabled(false),
m_dmrNetworkType("Gateway"),
m_dmrNetworkRemoteAddress(),
m_dmrNetworkRemotePort(0U),
m_dmrNetworkGatewayAddress(),
m_dmrNetworkGatewayPort(0U),
m_dmrNetworkLocalAddress(),
m_dmrNetworkLocalPort(0U),
m_dmrNetworkPassword(),
m_dmrNetworkOptions(),
m_dmrNetworkDebug(false),
m_dmrNetworkJitter(360U),
m_dmrNetworkSlot1(true),
@@ -948,20 +945,14 @@ 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, "RemoteAddress") == 0)
m_dmrNetworkRemoteAddress = value;
else if (::strcmp(key, "RemotePort") == 0)
m_dmrNetworkRemotePort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_dmrNetworkGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_dmrNetworkGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalAddress") == 0)
m_dmrNetworkLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_dmrNetworkLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "Password") == 0)
m_dmrNetworkPassword = value;
else if (::strcmp(key, "Options") == 0)
m_dmrNetworkOptions = value;
else if (::strcmp(key, "Debug") == 0)
m_dmrNetworkDebug = ::atoi(value) == 1;
else if (::strcmp(key, "Jitter") == 0)
@@ -2067,19 +2058,14 @@ bool CConf::getDMRNetworkEnabled() const
return m_dmrNetworkEnabled;
}
std::string CConf::getDMRNetworkType() const
std::string CConf::getDMRNetworkGatewayAddress() const
{
return m_dmrNetworkType;
return m_dmrNetworkGatewayAddress;
}
std::string CConf::getDMRNetworkRemoteAddress() const
unsigned short CConf::getDMRNetworkGatewayPort() const
{
return m_dmrNetworkRemoteAddress;
}
unsigned short CConf::getDMRNetworkRemotePort() const
{
return m_dmrNetworkRemotePort;
return m_dmrNetworkGatewayPort;
}
std::string CConf::getDMRNetworkLocalAddress() const
@@ -2092,16 +2078,6 @@ unsigned short CConf::getDMRNetworkLocalPort() const
return m_dmrNetworkLocalPort;
}
std::string CConf::getDMRNetworkPassword() const
{
return m_dmrNetworkPassword;
}
std::string CConf::getDMRNetworkOptions() const
{
return m_dmrNetworkOptions;
}
unsigned int CConf::getDMRNetworkModeHang() const
{
return m_dmrNetworkModeHang;