|
|
@ -89,6 +89,7 @@ m_fcsNetwork(NULL),
|
|
|
|
m_linkType(LINK_NONE),
|
|
|
|
m_linkType(LINK_NONE),
|
|
|
|
m_current(),
|
|
|
|
m_current(),
|
|
|
|
m_startup(),
|
|
|
|
m_startup(),
|
|
|
|
|
|
|
|
m_options(),
|
|
|
|
m_exclude(false),
|
|
|
|
m_exclude(false),
|
|
|
|
m_inactivityTimer(1000U),
|
|
|
|
m_inactivityTimer(1000U),
|
|
|
|
m_lostTimer(1000U, 120U),
|
|
|
|
m_lostTimer(1000U, 120U),
|
|
|
@ -254,6 +255,7 @@ int CYSFGateway::run()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
m_startup = m_conf.getNetworkStartup();
|
|
|
|
m_startup = m_conf.getNetworkStartup();
|
|
|
|
|
|
|
|
m_options = m_conf.getNetworkOptions();
|
|
|
|
bool revert = m_conf.getNetworkRevert();
|
|
|
|
bool revert = m_conf.getNetworkRevert();
|
|
|
|
bool wiresXCommandPassthrough = m_conf.getWiresXCommandPassthrough();
|
|
|
|
bool wiresXCommandPassthrough = m_conf.getWiresXCommandPassthrough();
|
|
|
|
|
|
|
|
|
|
|
@ -803,6 +805,8 @@ void CYSFGateway::startupLinking()
|
|
|
|
m_linkType = LINK_NONE;
|
|
|
|
m_linkType = LINK_NONE;
|
|
|
|
|
|
|
|
|
|
|
|
bool ok = m_fcsNetwork->writeLink(m_startup);
|
|
|
|
bool ok = m_fcsNetwork->writeLink(m_startup);
|
|
|
|
|
|
|
|
m_fcsNetwork->setOptions(m_options);
|
|
|
|
|
|
|
|
|
|
|
|
if (ok) {
|
|
|
|
if (ok) {
|
|
|
|
LogMessage("Automatic (re-)connection to %s", m_startup.c_str());
|
|
|
|
LogMessage("Automatic (re-)connection to %s", m_startup.c_str());
|
|
|
|
|
|
|
|
|
|
|
@ -823,6 +827,8 @@ void CYSFGateway::startupLinking()
|
|
|
|
if (reflector != NULL) {
|
|
|
|
if (reflector != NULL) {
|
|
|
|
LogMessage("Automatic (re-)connection to %5.5s - \"%s\"", reflector->m_id.c_str(), reflector->m_name.c_str());
|
|
|
|
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_wiresX->setReflector(reflector);
|
|
|
|
|
|
|
|
|
|
|
|
m_ysfNetwork->setDestination(reflector->m_name, reflector->m_address, reflector->m_port);
|
|
|
|
m_ysfNetwork->setDestination(reflector->m_name, reflector->m_address, reflector->m_port);
|
|
|
|