dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request #110 from juribeparada/master

Browse source 
Not load FCS rooms if FCS is disabled
This commit is contained in:
Jonathan Naylor 2018-05-14 09:59:09 +01:00 • committed by GitHub
commit c8c211c4d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
YSFGateway/YSFGateway.cpp
View file

@ -89,7 +89,8 @@ m_current(),
m_startup(), m_startup(),
m_exclude(false), m_exclude(false),
m_inactivityTimer(1000U), m_inactivityTimer(1000U),
m_lostTimer(1000U, 120U) m_lostTimer(1000U, 120U),
m_fcsNetworkEnabled(false)
{ {
} }
@ -204,8 +205,8 @@ int CYSFGateway::run()
} }
} }
bool fcsNetworkEnabled = m_conf.getFCSNetworkEnabled(); m_fcsNetworkEnabled = m_conf.getFCSNetworkEnabled();
if (fcsNetworkEnabled) { if (m_fcsNetworkEnabled) {
unsigned int txFrequency = m_conf.getTxFrequency(); unsigned int txFrequency = m_conf.getTxFrequency();
unsigned int rxFrequency = m_conf.getRxFrequency(); unsigned int rxFrequency = m_conf.getRxFrequency();
std::string locator = calculateLocator(); std::string locator = calculateLocator();
@ -478,6 +479,7 @@ void CYSFGateway::createWiresX(CYSFNetwork* rptNetwork)
m_wiresX->setYSF2P25(address, port); m_wiresX->setYSF2P25(address, port);
std::string filename = m_conf.getFCSNetworkFile(); std::string filename = m_conf.getFCSNetworkFile();
if (m_fcsNetworkEnabled)
readFCSRoomsFile(filename); readFCSRoomsFile(filename);
m_reflectors->load(); m_reflectors->load();

1
YSFGateway/YSFGateway.h
View file

@ -60,6 +60,7 @@ private:
bool m_exclude; bool m_exclude;
CTimer m_inactivityTimer; CTimer m_inactivityTimer;
CTimer m_lostTimer; CTimer m_lostTimer;
bool m_fcsNetworkEnabled;
void startupLinking(); void startupLinking();
std::string calculateLocator(); std::string calculateLocator();