mirror of
https://github.com/oe7drt/YSFClients.git
synced 2026-04-06 06:43:53 +00:00
Begin adding FCS specific code.
This commit is contained in:
Jonathan Naylor
parent
c84df3db5e
commit
05c0cce1db
12 changed files with 420 additions and 108 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
|
||||
* Copyright (C) 2015,2016,2017,2018 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
|
||||
|
|
@ -32,7 +32,8 @@ enum SECTION {
|
|||
SECTION_INFO,
|
||||
SECTION_LOG,
|
||||
SECTION_APRS_FI,
|
||||
SECTION_NETWORK
|
||||
SECTION_YSF_NETWORK,
|
||||
SECTION_FCS_NETWORK
|
||||
};
|
||||
|
||||
CConf::CConf(const std::string& file) :
|
||||
|
|
@ -61,18 +62,21 @@ m_aprsServer(),
|
|||
m_aprsPort(0U),
|
||||
m_aprsPassword(),
|
||||
m_aprsDescription(),
|
||||
m_networkEnabled(false),
|
||||
m_networkPort(0U),
|
||||
m_networkHosts(),
|
||||
m_networkReloadTime(0U),
|
||||
m_networkParrotAddress("127.0.0.1"),
|
||||
m_networkParrotPort(0U),
|
||||
m_networkYSF2DMRAddress("127.0.0.1"),
|
||||
m_networkYSF2DMRPort(0U),
|
||||
m_networkStartup(),
|
||||
m_networkInactivityTimeout(0U),
|
||||
m_networkRevert(false),
|
||||
m_networkDebug(false)
|
||||
m_ysfNetworkEnabled(false),
|
||||
m_ysfNetworkPort(0U),
|
||||
m_ysfNetworkHosts(),
|
||||
m_ysfNetworkReloadTime(0U),
|
||||
m_ysfNetworkParrotAddress("127.0.0.1"),
|
||||
m_ysfNetworkParrotPort(0U),
|
||||
m_ysfNetworkYSF2DMRAddress("127.0.0.1"),
|
||||
m_ysfNetworkYSF2DMRPort(0U),
|
||||
m_ysfNetworkStartup(),
|
||||
m_ysfNetworkInactivityTimeout(0U),
|
||||
m_ysfNetworkRevert(false),
|
||||
m_ysfNetworkDebug(false),
|
||||
m_fcsNetworkEnabled(false),
|
||||
m_fcsNetworkPort(0U),
|
||||
m_fcsNetworkDebug(false)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -102,10 +106,12 @@ bool CConf::read()
|
|||
section = SECTION_INFO;
|
||||
else if (::strncmp(buffer, "[Log]", 5U) == 0)
|
||||
section = SECTION_LOG;
|
||||
else if (::strncmp(buffer, "[aprs.fi]", 5U) == 0)
|
||||
else if (::strncmp(buffer, "[aprs.fi]", 9U) == 0)
|
||||
section = SECTION_APRS_FI;
|
||||
else if (::strncmp(buffer, "[Network]", 5U) == 0)
|
||||
section = SECTION_NETWORK;
|
||||
else if (::strncmp(buffer, "[YSF Network]", 13U) == 0)
|
||||
section = SECTION_YSF_NETWORK;
|
||||
else if (::strncmp(buffer, "[FCS Network]", 13U) == 0)
|
||||
section = SECTION_FCS_NETWORK;
|
||||
else
|
||||
section = SECTION_NONE;
|
||||
|
||||
|
|
@ -175,31 +181,38 @@ bool CConf::read()
|
|||
m_aprsPassword = value;
|
||||
else if (::strcmp(key, "Description") == 0)
|
||||
m_aprsDescription = value;
|
||||
} else if (section == SECTION_NETWORK) {
|
||||
} else if (section == SECTION_YSF_NETWORK) {
|
||||
if (::strcmp(key, "Enable") == 0)
|
||||
m_networkEnabled = ::atoi(value) == 1;
|
||||
m_ysfNetworkEnabled = ::atoi(value) == 1;
|
||||
else if (::strcmp(key, "Port") == 0)
|
||||
m_networkPort = (unsigned int)::atoi(value);
|
||||
m_ysfNetworkPort = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "Hosts") == 0)
|
||||
m_networkHosts = value;
|
||||
m_ysfNetworkHosts = value;
|
||||
else if (::strcmp(key, "ReloadTime") == 0)
|
||||
m_networkReloadTime = (unsigned int)::atoi(value);
|
||||
m_ysfNetworkReloadTime = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "ParrotAddress") == 0)
|
||||
m_networkParrotAddress = value;
|
||||
m_ysfNetworkParrotAddress = value;
|
||||
else if (::strcmp(key, "ParrotPort") == 0)
|
||||
m_networkParrotPort = (unsigned int)::atoi(value);
|
||||
m_ysfNetworkParrotPort = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "YSF2DMRAddress") == 0)
|
||||
m_networkYSF2DMRAddress = value;
|
||||
m_ysfNetworkYSF2DMRAddress = value;
|
||||
else if (::strcmp(key, "YSF2DMRPort") == 0)
|
||||
m_networkYSF2DMRPort = (unsigned int)::atoi(value);
|
||||
m_ysfNetworkYSF2DMRPort = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "Startup") == 0)
|
||||
m_networkStartup = value;
|
||||
m_ysfNetworkStartup = value;
|
||||
else if (::strcmp(key, "InactivityTimeout") == 0)
|
||||
m_networkInactivityTimeout = (unsigned int)::atoi(value);
|
||||
m_ysfNetworkInactivityTimeout = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "Revert") == 0)
|
||||
m_networkRevert = ::atoi(value) == 1;
|
||||
m_ysfNetworkRevert = ::atoi(value) == 1;
|
||||
else if (::strcmp(key, "Debug") == 0)
|
||||
m_networkDebug = ::atoi(value) == 1;
|
||||
m_ysfNetworkDebug = ::atoi(value) == 1;
|
||||
} else if (section == SECTION_FCS_NETWORK) {
|
||||
if (::strcmp(key, "Enable") == 0)
|
||||
m_fcsNetworkEnabled = ::atoi(value) == 1;
|
||||
else if (::strcmp(key, "Port") == 0)
|
||||
m_fcsNetworkPort = (unsigned int)::atoi(value);
|
||||
else if (::strcmp(key, "Debug") == 0)
|
||||
m_fcsNetworkDebug = ::atoi(value) == 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -328,62 +341,77 @@ std::string CConf::getAPRSDescription() const
|
|||
return m_aprsDescription;
|
||||
}
|
||||
|
||||
bool CConf::getNetworkEnabled() const
|
||||
bool CConf::getYSFNetworkEnabled() const
|
||||
{
|
||||
return m_networkEnabled;
|
||||
return m_ysfNetworkEnabled;
|
||||
}
|
||||
|
||||
unsigned int CConf::getNetworkPort() const
|
||||
unsigned int CConf::getYSFNetworkPort() const
|
||||
{
|
||||
return m_networkPort;
|
||||
return m_ysfNetworkPort;
|
||||
}
|
||||
|
||||
std::string CConf::getNetworkHosts() const
|
||||
std::string CConf::getYSFNetworkHosts() const
|
||||
{
|
||||
return m_networkHosts;
|
||||
return m_ysfNetworkHosts;
|
||||
}
|
||||
|
||||
unsigned int CConf::getNetworkReloadTime() const
|
||||
unsigned int CConf::getYSFNetworkReloadTime() const
|
||||
{
|
||||
return m_networkReloadTime;
|
||||
return m_ysfNetworkReloadTime;
|
||||
}
|
||||
|
||||
std::string CConf::getNetworkParrotAddress() const
|
||||
std::string CConf::getYSFNetworkParrotAddress() const
|
||||
{
|
||||
return m_networkParrotAddress;
|
||||
return m_ysfNetworkParrotAddress;
|
||||
}
|
||||
|
||||
unsigned int CConf::getNetworkParrotPort() const
|
||||
unsigned int CConf::getYSFNetworkParrotPort() const
|
||||
{
|
||||
return m_networkParrotPort;
|
||||
return m_ysfNetworkParrotPort;
|
||||
}
|
||||
|
||||
std::string CConf::getNetworkYSF2DMRAddress() const
|
||||
std::string CConf::getYSFNetworkYSF2DMRAddress() const
|
||||
{
|
||||
return m_networkYSF2DMRAddress;
|
||||
return m_ysfNetworkYSF2DMRAddress;
|
||||
}
|
||||
|
||||
unsigned int CConf::getNetworkYSF2DMRPort() const
|
||||
unsigned int CConf::getYSFNetworkYSF2DMRPort() const
|
||||
{
|
||||
return m_networkYSF2DMRPort;
|
||||
return m_ysfNetworkYSF2DMRPort;
|
||||
}
|
||||
|
||||
std::string CConf::getNetworkStartup() const
|
||||
std::string CConf::getYSFNetworkStartup() const
|
||||
{
|
||||
return m_networkStartup;
|
||||
return m_ysfNetworkStartup;
|
||||
}
|
||||
|
||||
unsigned int CConf::getNetworkInactivityTimeout() const
|
||||
unsigned int CConf::getYSFNetworkInactivityTimeout() const
|
||||
{
|
||||
return m_networkInactivityTimeout;
|
||||
return m_ysfNetworkInactivityTimeout;
|
||||
}
|
||||
|
||||
bool CConf::getNetworkRevert() const
|
||||
bool CConf::getYSFNetworkRevert() const
|
||||
{
|
||||
return m_networkRevert;
|
||||
return m_ysfNetworkRevert;
|
||||
}
|
||||
|
||||
bool CConf::getNetworkDebug() const
|
||||
bool CConf::getYSFNetworkDebug() const
|
||||
{
|
||||
return m_networkDebug;
|
||||
return m_ysfNetworkDebug;
|
||||
}
|
||||
|
||||
bool CConf::getFCSNetworkEnabled() const
|
||||
{
|
||||
return m_fcsNetworkEnabled;
|
||||
}
|
||||
|
||||
unsigned int CConf::getFCSNetworkPort() const
|
||||
{
|
||||
return m_fcsNetworkPort;
|
||||
}
|
||||
|
||||
bool CConf::getFCSNetworkDebug() const
|
||||
{
|
||||
return m_fcsNetworkDebug;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue