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

Align the networking with NXCore.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-03-01 20:28:43 +00:00
parent dcb9dd31a9
commit 12cfaec1f6
4 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Conf.cpp
View File

@@ -183,10 +183,7 @@ m_p25LocalPort(0U),
m_p25NetworkModeHang(3U), m_p25NetworkModeHang(3U),
m_p25NetworkDebug(false), m_p25NetworkDebug(false),
m_nxdnNetworkEnabled(false), m_nxdnNetworkEnabled(false),
m_nxdnNetworkMyAddress(), m_nxdnNetworkAddress(),
m_nxdnNetworkMyPort(0U),
m_nxdnNetworkGatewayAddress(),
m_nxdnNetworkGatewayPort(0U),
m_nxdnNetworkModeHang(3U), m_nxdnNetworkModeHang(3U),
m_nxdnNetworkDebug(false), m_nxdnNetworkDebug(false),
m_tftSerialPort("/dev/ttyAMA0"), m_tftSerialPort("/dev/ttyAMA0"),
@@ -634,14 +631,8 @@ bool CConf::read()
} else if (section == SECTION_NXDN_NETWORK) { } else if (section == SECTION_NXDN_NETWORK) {
if (::strcmp(key, "Enable") == 0) if (::strcmp(key, "Enable") == 0)
m_nxdnNetworkEnabled = ::atoi(value) == 1; m_nxdnNetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "LocalAddress") == 0) else if (::strcmp(key, "Address") == 0)
m_nxdnNetworkMyAddress = value; m_nxdnNetworkAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_nxdnNetworkMyPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_nxdnNetworkGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_nxdnNetworkGatewayPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0) else if (::strcmp(key, "ModeHang") == 0)
m_nxdnNetworkModeHang = (unsigned int)::atoi(value); m_nxdnNetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0) else if (::strcmp(key, "Debug") == 0)
@@ -1351,24 +1342,9 @@ bool CConf::getNXDNNetworkEnabled() const
return m_nxdnNetworkEnabled; return m_nxdnNetworkEnabled;
} }
std::string CConf::getNXDNNetworkMyAddress() const std::string CConf::getNXDNNetworkAddress() const
{ {
return m_nxdnNetworkMyAddress; return m_nxdnNetworkAddress;
}
unsigned int CConf::getNXDNNetworkMyPort() const
{
return m_nxdnNetworkMyPort;
}
std::string CConf::getNXDNNetworkGatewayAddress() const
{
return m_nxdnNetworkGatewayAddress;
}
unsigned int CConf::getNXDNNetworkGatewayPort() const
{
return m_nxdnNetworkGatewayPort;
} }
unsigned int CConf::getNXDNNetworkModeHang() const unsigned int CConf::getNXDNNetworkModeHang() const

10
Conf.h
View File

@@ -191,10 +191,7 @@ public:
// The NXDN Network section // The NXDN Network section
bool getNXDNNetworkEnabled() const; bool getNXDNNetworkEnabled() const;
std::string getNXDNNetworkMyAddress() const; std::string getNXDNNetworkAddress() const;
unsigned int getNXDNNetworkMyPort() const;
std::string getNXDNNetworkGatewayAddress() const;
unsigned int getNXDNNetworkGatewayPort() const;
unsigned int getNXDNNetworkModeHang() const; unsigned int getNXDNNetworkModeHang() const;
bool getNXDNNetworkDebug() const; bool getNXDNNetworkDebug() const;
@@ -381,10 +378,7 @@ private:
bool m_p25NetworkDebug; bool m_p25NetworkDebug;
bool m_nxdnNetworkEnabled; bool m_nxdnNetworkEnabled;
std::string m_nxdnNetworkMyAddress; std::string m_nxdnNetworkAddress;
unsigned int m_nxdnNetworkMyPort;
std::string m_nxdnNetworkGatewayAddress;
unsigned int m_nxdnNetworkGatewayPort;
unsigned int m_nxdnNetworkModeHang; unsigned int m_nxdnNetworkModeHang;
bool m_nxdnNetworkDebug; bool m_nxdnNetworkDebug;

5
MMDVM.ini
View File

@@ -160,10 +160,7 @@ Debug=0
[NXDN Network] [NXDN Network]
Enable=1 Enable=1
LocalAddress=127.0.0.1 Address=127.0.0.1
LocalPort=3300
GatewayAddress=127.0.0.1
GatewayPort=4300
# ModeHang=3 # ModeHang=3
Debug=0 Debug=0

16
MMDVMHost.cpp
View File

@@ -1159,21 +1159,15 @@ bool CMMDVMHost::createP25Network()
bool CMMDVMHost::createNXDNNetwork() bool CMMDVMHost::createNXDNNetwork()
{ {
std::string myAddress = m_conf.getNXDNNetworkMyAddress(); std::string address = m_conf.getNXDNNetworkAddress();
unsigned int myPort = m_conf.getNXDNNetworkMyPort(); m_nxdnNetModeHang = m_conf.getNXDNNetworkModeHang();
std::string gatewayAddress = m_conf.getNXDNNetworkGatewayAddress(); bool debug = m_conf.getNXDNNetworkDebug();
unsigned int gatewayPort = m_conf.getNXDNNetworkGatewayPort();
m_nxdnNetModeHang = m_conf.getNXDNNetworkModeHang();
bool debug = m_conf.getNXDNNetworkDebug();
LogInfo("NXDN Network Parameters"); LogInfo("NXDN Network Parameters");
LogInfo(" Local Address: %s", myAddress.c_str()); LogInfo(" Address: %s", address.c_str());
LogInfo(" Local Port: %u", myPort);
LogInfo(" Gateway Address: %s", gatewayAddress.c_str());
LogInfo(" Gateway Port: %u", gatewayPort);
LogInfo(" Mode Hang: %us", m_nxdnNetModeHang); LogInfo(" Mode Hang: %us", m_nxdnNetModeHang);
m_nxdnNetwork = new CNXDNNetwork(myAddress, myPort, gatewayAddress, gatewayPort, debug); m_nxdnNetwork = new CNXDNNetwork(address, debug);
bool ret = m_nxdnNetwork->open(); bool ret = m_nxdnNetwork->open();
if (!ret) { if (!ret) {