oe7drt/YSFClients
1
0
Fork 0
mirror of https://github.com/oe7drt/YSFClients.git synced 2026-04-05 06:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into IPv6

Browse source
This commit is contained in:
Jonathan Naylor 2020-09-05 22:17:07 +01:00
commit 91f04abddb
8 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
YSFGateway/YSFGateway.cpp
View file

@ -89,6 +89,7 @@ m_fcsNetwork(NULL),
m_linkType(LINK_NONE),
m_current(),
m_startup(),
m_options(),
m_exclude(false),
m_inactivityTimer(1000U),
m_lostTimer(1000U, 120U),
@ -259,6 +260,7 @@ int CYSFGateway::run()
}
m_startup = m_conf.getNetworkStartup();
m_options = m_conf.getNetworkOptions();
bool revert = m_conf.getNetworkRevert();
bool wiresXCommandPassthrough = m_conf.getWiresXCommandPassthrough();
@ -808,6 +810,8 @@ void CYSFGateway::startupLinking()
m_linkType = LINK_NONE;
bool ok = m_fcsNetwork->writeLink(m_startup);
m_fcsNetwork->setOptions(m_options);
if (ok) {
LogMessage("Automatic (re-)connection to %s", m_startup.c_str());
@ -828,6 +832,8 @@ void CYSFGateway::startupLinking()
if (reflector != NULL) {
LogMessage("Automatic (re-)connection to %5.5s - \"%s\"", reflector->m_id.c_str(), reflector->m_name.c_str());
m_ysfNetwork->setOptions(m_options);
m_wiresX->setReflector(reflector);
m_ysfNetwork->setDestination(reflector->m_name, reflector->m_addr, reflector->m_addrLen);