Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Be more agressive at trying to reconnect after a failure.

Browse source
This commit is contained in:
Jonathan Naylor 2016-04-25 17:10:56 +01:00
parent 56916cdb0d
commit 6f42e0dad3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
DMRIPSC.cpp
View file

@ -353,6 +353,7 @@ void CDMRIPSC::clock(unsigned int ms)
m_status = DISCONNECTED; // XXX m_status = DISCONNECTED; // XXX
m_timeoutTimer.stop(); m_timeoutTimer.stop();
m_retryTimer.stop(); m_retryTimer.stop();
m_pingTimer.stop();
} else if (::memcmp(m_buffer, "MSTPONG", 7U) == 0) { } else if (::memcmp(m_buffer, "MSTPONG", 7U) == 0) {
m_timeoutTimer.start(); m_timeoutTimer.start();
} else if (::memcmp(m_buffer, "RPTSBKN", 7U) == 0) { } else if (::memcmp(m_buffer, "RPTSBKN", 7U) == 0) {
@ -391,10 +392,11 @@ void CDMRIPSC::clock(unsigned int ms)
m_timeoutTimer.clock(ms); m_timeoutTimer.clock(ms);
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) { if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) {
LogError("Connection to the master has timed out"); LogError("Connection to the master has timed out, retrying connection");
m_status = DISCONNECTED; m_status = WAITING_LOGIN;
m_timeoutTimer.stop(); m_timeoutTimer.start();
m_retryTimer.stop(); m_retryTimer.start();
m_pingTimer.stop();
} }
} }