dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Attempt to fix the inactivity timeout.

Browse source
This commit is contained in:
Jonathan Naylor 2018-05-24 18:17:37 +01:00
parent c8c211c4d6
commit 11cad79a95
1 changed files with 6 additions and 9 deletions

15
YSFGateway/YSFGateway.cpp
View file

@ -343,13 +343,10 @@ int CYSFGateway::run()
} }
m_current.clear(); m_current.clear();
m_inactivityTimer.stop();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
startupLinking(); startupLinking();
} else {
m_inactivityTimer.start();
} }
} else { } else {
if (m_linkType == LINK_YSF) { if (m_linkType == LINK_YSF) {
@ -366,10 +363,11 @@ int CYSFGateway::run()
} }
m_current.clear(); m_current.clear();
m_inactivityTimer.stop();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
} }
m_inactivityTimer.start();
} }
m_lostTimer.clock(ms); m_lostTimer.clock(ms);
@ -386,7 +384,7 @@ int CYSFGateway::run()
} }
m_current.clear(); m_current.clear();
m_inactivityTimer.stop(); m_inactivityTimer.start();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
} }
@ -523,7 +521,7 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_fcsNetwork->writeUnlink(3U); m_fcsNetwork->writeUnlink(3U);
m_current.clear(); m_current.clear();
m_inactivityTimer.stop(); m_inactivityTimer.start();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
@ -536,7 +534,6 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
bool ok = m_fcsNetwork->writeLink(name); bool ok = m_fcsNetwork->writeLink(name);
if (ok) { if (ok) {
m_current = name; m_current = name;
m_inactivityTimer.start();
m_lostTimer.start(); m_lostTimer.start();
m_linkType = LINK_FCS; m_linkType = LINK_FCS;
} else { } else {
@ -552,7 +549,7 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_ysfNetwork->clearDestination(); m_ysfNetwork->clearDestination();
m_current.clear(); m_current.clear();
m_inactivityTimer.stop(); m_inactivityTimer.start();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
} }
@ -563,7 +560,7 @@ void CYSFGateway::processWiresX(const unsigned char* buffer, unsigned char fi, u
m_fcsNetwork->clearDestination(); m_fcsNetwork->clearDestination();
m_current.clear(); m_current.clear();
m_inactivityTimer.stop(); m_inactivityTimer.start();
m_lostTimer.stop(); m_lostTimer.stop();
m_linkType = LINK_NONE; m_linkType = LINK_NONE;
} }