ShaYmez/NXDNClients
1
0
Fork 0
mirror of https://github.com/ShaYmez/NXDNClients.git synced 2024-11-29 18:48:45 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into IPv6

Browse Source
This commit is contained in:
Jonathan Naylor 2020-09-08 09:37:17 +01:00
commit 66018b909d
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
NXDNReflector/Conf.cpp
View File

@ -31,7 +31,7 @@ enum SECTION {
SECTION_GENERAL, SECTION_GENERAL,
SECTION_ID_LOOKUP, SECTION_ID_LOOKUP,
SECTION_LOG, SECTION_LOG,
SECTION_YSF_NETWORK, SECTION_NETWORK,
SECTION_ICOM_NETWORK, SECTION_ICOM_NETWORK,
SECTION_KENWOOD_NETWORK SECTION_KENWOOD_NETWORK
}; };
@ -46,8 +46,8 @@ m_logDisplayLevel(0U),
m_logFileLevel(0U), m_logFileLevel(0U),
m_logFilePath(), m_logFilePath(),
m_logFileRoot(), m_logFileRoot(),
m_ysfPort(0U), m_networkPort(0U),
m_ysfDebug(false), m_networkDebug(false),
m_icomEnabled(false), m_icomEnabled(false),
m_icomAddress(), m_icomAddress(),
m_icomTGEnable(0U), m_icomTGEnable(0U),
@ -87,8 +87,8 @@ bool CConf::read()
section = SECTION_ID_LOOKUP; section = SECTION_ID_LOOKUP;
else if (::strncmp(buffer, "[Log]", 5U) == 0) else if (::strncmp(buffer, "[Log]", 5U) == 0)
section = SECTION_LOG; section = SECTION_LOG;
else if (::strncmp(buffer, "[YSF Network]", 13U) == 0) else if (::strncmp(buffer, "[Network]", 9U) == 0)
section = SECTION_YSF_NETWORK; section = SECTION_NETWORK;
else if (::strncmp(buffer, "[Icom Network]", 14U) == 0) else if (::strncmp(buffer, "[Icom Network]", 14U) == 0)
section = SECTION_ICOM_NETWORK; section = SECTION_ICOM_NETWORK;
else if (::strncmp(buffer, "[Kenwood Network]", 17U) == 0) else if (::strncmp(buffer, "[Kenwood Network]", 17U) == 0)
@ -143,11 +143,11 @@ bool CConf::read()
m_logFileLevel = (unsigned int)::atoi(value); m_logFileLevel = (unsigned int)::atoi(value);
else if (::strcmp(key, "DisplayLevel") == 0) else if (::strcmp(key, "DisplayLevel") == 0)
m_logDisplayLevel = (unsigned int)::atoi(value); m_logDisplayLevel = (unsigned int)::atoi(value);
} else if (section == SECTION_YSF_NETWORK) { } else if (section == SECTION_NETWORK) {
if (::strcmp(key, "Port") == 0) if (::strcmp(key, "Port") == 0)
m_ysfPort = (unsigned int)::atoi(value); m_networkPort = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0) else if (::strcmp(key, "Debug") == 0)
m_ysfDebug = ::atoi(value) == 1; m_networkDebug = ::atoi(value) == 1;
} else if (section == SECTION_ICOM_NETWORK) { } else if (section == SECTION_ICOM_NETWORK) {
if (::strcmp(key, "Enabled") == 0) if (::strcmp(key, "Enabled") == 0)
m_icomEnabled = ::atoi(value) == 1; m_icomEnabled = ::atoi(value) == 1;
@ -210,22 +210,22 @@ unsigned int CConf::getLogFileLevel() const
std::string CConf::getLogFilePath() const std::string CConf::getLogFilePath() const
{ {
return m_logFilePath; return m_logFilePath;
} }
std::string CConf::getLogFileRoot() const std::string CConf::getLogFileRoot() const
{ {
return m_logFileRoot; return m_logFileRoot;
} }
unsigned int CConf::getYSFPort() const unsigned int CConf::getNetworkPort() const
{ {
return m_ysfPort; return m_networkPort;
} }
bool CConf::getYSFDebug() const bool CConf::getNetworkDebug() const
{ {
return m_ysfDebug; return m_networkDebug;
} }
bool CConf::getIcomEnabled() const bool CConf::getIcomEnabled() const

10
NXDNReflector/Conf.h
View File

@ -44,9 +44,9 @@ public:
std::string getLogFilePath() const; std::string getLogFilePath() const;
std::string getLogFileRoot() const; std::string getLogFileRoot() const;
// The YSF Network section // The Network section
unsigned int getYSFPort() const; unsigned int getNetworkPort() const;
bool getYSFDebug() const; bool getNetworkDebug() const;
// The Icom Network section // The Icom Network section
bool getIcomEnabled() const; bool getIcomEnabled() const;
@ -75,8 +75,8 @@ private:
std::string m_logFilePath; std::string m_logFilePath;
std::string m_logFileRoot; std::string m_logFileRoot;
unsigned int m_ysfPort; unsigned int m_networkPort;
bool m_ysfDebug; bool m_networkDebug;
bool m_icomEnabled; bool m_icomEnabled;
std::string m_icomAddress; std::string m_icomAddress;

2
NXDNReflector/NXDNReflector.cpp
View File

@ -168,7 +168,7 @@ void CNXDNReflector::run()
unsigned short tg = m_conf.getTG(); unsigned short tg = m_conf.getTG();
CNXDNNetwork nxdnNetwork(m_conf.getYSFPort(), m_conf.getYSFDebug()); CNXDNNetwork nxdnNetwork(m_conf.getNetworkPort(), m_conf.getNetworkDebug());
ret = nxdnNetwork.open(); ret = nxdnNetwork.open();
if (!ret) { if (!ret) {
::LogFinalise(); ::LogFinalise();

2
NXDNReflector/NXDNReflector.ini
View File

@ -13,7 +13,7 @@ FileLevel=1
FilePath=. FilePath=.
FileRoot=NXDNReflector FileRoot=NXDNReflector
[YSF Network] [Network]
Port=41400 Port=41400
Debug=0 Debug=0

2
NXDNReflector/Version.h
View File

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200906"; const char* VERSION = "20200908";
#endif #endif