MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add more robustness to the IPSC link.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-05-10 07:20:38 +01:00
parent 35632e0255
commit 3b48aa3985
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
DMRIPSC.cpp
View File

@@ -119,11 +119,7 @@ bool CDMRIPSC::open()
if (!ret) if (!ret)
return false; return false;
ret = writeLogin(); writeLogin();
if (!ret) {
m_socket.close();
return false;
}
m_status = WAITING_LOGIN; m_status = WAITING_LOGIN;
m_timeoutTimer.start(); m_timeoutTimer.start();
@@ -272,15 +268,8 @@ bool CDMRIPSC::write(const CDMRData& data)
if (m_debug) if (m_debug)
CUtils::dump(1U, "IPSC Transmitted", buffer, HOMEBREW_DATA_PACKET_LENGTH); CUtils::dump(1U, "IPSC Transmitted", buffer, HOMEBREW_DATA_PACKET_LENGTH);
for (unsigned int i = 0U; i < count; i++) { for (unsigned int i = 0U; i < count; i++)
bool ret = write(buffer, HOMEBREW_DATA_PACKET_LENGTH); write(buffer, HOMEBREW_DATA_PACKET_LENGTH);
if (!ret) {
LogError("Socket has failed when writing data to the master, retrying connection");
close();
open();
return false;
}
}
return true; return true;
} }
@@ -332,7 +321,7 @@ void CDMRIPSC::clock(unsigned int ms)
m_retryTimer.start(); m_retryTimer.start();
m_pingTimer.stop(); m_pingTimer.stop();
} else { } else {
LogError("Login to the master has failed"); LogError("Login to the master has failed, stopping IPSC");
m_status = DISCONNECTED; m_status = DISCONNECTED;
m_timeoutTimer.stop(); m_timeoutTimer.stop();
m_retryTimer.stop(); m_retryTimer.stop();
@@ -497,5 +486,13 @@ bool CDMRIPSC::write(const unsigned char* data, unsigned int length)
// if (m_debug) // if (m_debug)
// CUtils::dump(1U, "IPSC Transmitted", data, length); // CUtils::dump(1U, "IPSC Transmitted", data, length);
return m_socket.write(data, length, m_address, m_port); bool ret = m_socket.write(data, length, m_address, m_port);
if (!ret) {
LogError("Socket has failed when writing data to the master, retrying connection");
close();
open();
return false;
}
return true;
} }