g4klx/DMRGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DMRGateway.git synced 2026-01-04 23:50:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from g0wfv/develop

Browse source 
Changes to handing of repeater and master disconnects
This commit is contained in:
Jonathan Naylor 2017-06-08 12:00:53 +01:00 committed by GitHub
parent 87bee93b2b fc4d79abe9
commit db417dfa78
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
DMRNetwork.cpp
View file

@ -324,7 +324,7 @@ void CDMRNetwork::clock(unsigned int ms)
m_rxData.addData(m_buffer, len);
} else if (::memcmp(m_buffer, "MSTNAK", 6U) == 0) {
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_timeoutTimer.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
the Network sometimes times out and reaches here.
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();
open();
return;

17
MMDVMNetwork.cpp
View file

@ -94,7 +94,7 @@ unsigned int CMMDVMNetwork::getId() const
bool CMMDVMNetwork::open()
{
LogMessage("DMR, Opening MMDVM Network");
LogMessage("MMDVM Network, Opening");
return m_socket.open();
}
@ -258,18 +258,13 @@ void CMMDVMNetwork::close()
unsigned char buffer[HOMEBREW_DATA_PACKET_LENGTH];
::memset(buffer, 0x00U, HOMEBREW_DATA_PACKET_LENGTH);
LogMessage("DMR, Closing MMDVM Network");
LogMessage("MMDVM Network, Closing");
buffer[0U] = 'M';
buffer[1U] = 'S';
buffer[2U] = 'T';
buffer[3U] = 'N';
buffer[4U] = 'A';
buffer[5U] = 'K';
::memcpy(buffer + 0U, "MSTCL", 5U);
::memcpy(buffer + 5U, m_netId, 4U);
m_socket.write(buffer, HOMEBREW_DATA_PACKET_LENGTH, m_rptAddress, m_rptPort);
m_socket.close();
}
void CMMDVMNetwork::clock(unsigned int ms)
@ -278,7 +273,7 @@ void CMMDVMNetwork::clock(unsigned int ms)
unsigned int port;
int length = m_socket.read(m_buffer, BUFFER_LENGTH, address, port);
if (length < 0) {
LogError("DMR, Socket has failed, reopening");
LogError("MMDVM Network, Socket has failed, reopening");
close();
open();
return;
@ -317,6 +312,8 @@ void CMMDVMNetwork::clock(unsigned int ms)
::memcpy(ack + 0U, "RPTACK", 6U);
::memcpy(ack + 6U, m_netId, 4U);
m_socket.write(ack, 10U, m_rptAddress, m_rptPort);
} else if (::memcmp(m_buffer, "RPTCL", 5U) == 0) {
::LogMessage("MMDVM Network, The connected MMDVM is closing down");
} else if (::memcmp(m_buffer, "RPTC", 4U) == 0) {
m_configLen = length - 8U;
m_configData = new unsigned char[m_configLen];