MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 15:09:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make the DMR IPSC connection more resiliant.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-05-03 21:42:51 +01:00
parent 27abecd31d
commit eeb618e58b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMRIPSC.cpp
View File

@@ -350,10 +350,8 @@ void CDMRIPSC::clock(unsigned int ms)
} }
} else if (::memcmp(m_buffer, "MSTCL", 5U) == 0) { } else if (::memcmp(m_buffer, "MSTCL", 5U) == 0) {
LogError("Master is closing down"); LogError("Master is closing down");
m_status = DISCONNECTED; // XXX close();
m_timeoutTimer.stop(); open();
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) {
@@ -393,10 +391,8 @@ 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, retrying connection"); LogError("Connection to the master has timed out, retrying connection");
m_status = WAITING_LOGIN; close();
m_timeoutTimer.start(); open();
m_retryTimer.start();
m_pingTimer.stop();
} }
} }