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

Make DMR networking more robust.

Browse source
This commit is contained in:
Jonathan Naylor 2016-10-31 18:11:32 +00:00
parent 4f6356212b
commit 7431f5009a
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
DMRNetwork.cpp
View file

@ -116,12 +116,8 @@ bool CDMRNetwork::open()
{ {
LogMessage("DMR, Opening DMR Network"); LogMessage("DMR, Opening DMR Network");
bool ret = m_socket.open(); m_status = WAITING_CONNECT;
if (!ret) m_timeoutTimer.stop();
return false;
m_status = WAITING_LOGIN;
m_timeoutTimer.start();
m_retryTimer.start(); m_retryTimer.start();
return true; return true;
@ -302,8 +298,16 @@ void CDMRNetwork::clock(unsigned int ms)
if (m_status == WAITING_CONNECT) { if (m_status == WAITING_CONNECT) {
m_retryTimer.clock(ms); m_retryTimer.clock(ms);
if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) { if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) {
bool ret = open(); bool ret = m_socket.open();
if (ret) {
ret = writeLogin();
if (!ret) if (!ret)
return;
m_status = WAITING_LOGIN;
m_timeoutTimer.start();
}
m_retryTimer.start(); m_retryTimer.start();
} }
@ -316,8 +320,7 @@ void CDMRNetwork::clock(unsigned int ms)
if (length < 0) { if (length < 0) {
LogError("DMR, Socket has failed, retrying connection to the master"); LogError("DMR, Socket has failed, retrying connection to the master");
close(); close();
m_status = WAITING_CONNECT; open();
m_retryTimer.start();
return; return;
} }
@ -346,8 +349,7 @@ void CDMRNetwork::clock(unsigned int ms)
We want it to reconnect so... */ We want it to reconnect so... */
LogError("DMR, Login to the master has failed, retrying ..."); LogError("DMR, Login to the master has failed, retrying ...");
close(); close();
m_status = WAITING_CONNECT; open();
m_retryTimer.start();
return; return;
} }
} else if (::memcmp(m_buffer, "RPTACK", 6U) == 0) { } else if (::memcmp(m_buffer, "RPTACK", 6U) == 0) {
@ -377,8 +379,7 @@ void CDMRNetwork::clock(unsigned int ms)
} else if (::memcmp(m_buffer, "MSTCL", 5U) == 0) { } else if (::memcmp(m_buffer, "MSTCL", 5U) == 0) {
LogError("DMR, Master is closing down"); LogError("DMR, Master is closing down");
close(); close();
m_status = WAITING_CONNECT; open();
m_retryTimer.start();
} 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) {
@ -414,8 +415,7 @@ void CDMRNetwork::clock(unsigned int ms)
if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) { if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) {
LogError("DMR, Connection to the master has timed out, retrying connection"); LogError("DMR, Connection to the master has timed out, retrying connection");
close(); close();
m_status = WAITING_CONNECT; open();
m_retryTimer.start();
} }
} }
@ -431,11 +431,11 @@ bool CDMRNetwork::writeLogin()
bool CDMRNetwork::writeAuthorisation() bool CDMRNetwork::writeAuthorisation()
{ {
unsigned int size = m_password.size(); size_t size = m_password.size();
unsigned char* in = new unsigned char[size + sizeof(uint32_t)]; unsigned char* in = new unsigned char[size + sizeof(uint32_t)];
::memcpy(in, m_salt, sizeof(uint32_t)); ::memcpy(in, m_salt, sizeof(uint32_t));
for (unsigned int i = 0U; i < size; i++) for (size_t i = 0U; i < size; i++)
in[i + sizeof(uint32_t)] = m_password.at(i); in[i + sizeof(uint32_t)] = m_password.at(i);
unsigned char out[40U]; unsigned char out[40U];
@ -443,7 +443,7 @@ bool CDMRNetwork::writeAuthorisation()
::memcpy(out + 4U, m_id, 4U); ::memcpy(out + 4U, m_id, 4U);
CSHA256 sha256; CSHA256 sha256;
sha256.buffer(in, size + sizeof(uint32_t), out + 8U); sha256.buffer(in, (unsigned int)(size + sizeof(uint32_t)), out + 8U);
delete[] in; delete[] in;
@ -526,8 +526,7 @@ bool CDMRNetwork::write(const unsigned char* data, unsigned int length)
if (!ret) { if (!ret) {
LogError("DMR, Socket has failed when writing data to the master, retrying connection"); LogError("DMR, Socket has failed when writing data to the master, retrying connection");
close(); close();
m_status = WAITING_CONNECT; open();
m_retryTimer.start();
return false; return false;
} }