Alter MSTNAK responses to differentiate stages of retry

This commit is contained in:
g0wfv
2017-06-08 10:31:08 +01:00
parent 2c94d8a6c2
commit fc4d79abe9

View File

@@ -324,7 +324,7 @@ void CDMRNetwork::clock(unsigned int ms)
m_rxData.addData(m_buffer, len); m_rxData.addData(m_buffer, len);
} else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) { } else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) {
if (m_status == RUNNING) { if (m_status == RUNNING) {
LogWarning("%s, The master is restarting, logging back in", m_name); LogWarning("%s, Login to the master has failed, retrying login ...", m_name);
m_status = WAITING_LOGIN; m_status = WAITING_LOGIN;
m_timeoutTimer.start(); m_timeoutTimer.start();
m_retryTimer.start(); m_retryTimer.start();
@@ -332,7 +332,7 @@ void CDMRNetwork::clock(unsigned int ms)
/* Once the modem death spiral has been prevented in Modem.cpp /* Once the modem death spiral has been prevented in Modem.cpp
the Network sometimes times out and reaches here. the Network sometimes times out and reaches here.
We want it to reconnect so... */ We want it to reconnect so... */
LogError("%s, Login to the master has failed, retrying ...", m_name); LogError("%s, Login to the master has failed, retrying network ...", m_name);
close(); close();
open(); open();
return; return;