Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better handle packet sequence out-of-sync checking (additional current - 1 check);

Browse Source
pull/41/head
Bryan Biedenkapp 2 years ago
parent 28552617e4
commit f2de61a92f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/network/Network.cpp
Unescape View File

@ -304,7 +304,7 @@ void Network::clock(uint32_t ms)
else {
if (m_rxDMRStreamId[slotNo] == streamId) {
if (m_pktSeq != 0U && m_pktLastSeq != 0U) {
if (m_pktSeq >= 1U && m_pktSeq != m_pktLastSeq + 1) {
if (m_pktSeq >= 1U && ((m_pktSeq != m_pktLastSeq + 1) && (m_pktSeq - 1 != m_pktLastSeq + 1))) {
LogWarning(LOG_NET, "DMR Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
}
}
@ -332,7 +332,7 @@ void Network::clock(uint32_t ms)
else {
if (m_rxP25StreamId == streamId) {
if (m_pktSeq != 0U && m_pktLastSeq != 0U) {
if (m_pktSeq >= 1U && m_pktSeq != m_pktLastSeq + 1) {
if (m_pktSeq >= 1U && ((m_pktSeq != m_pktLastSeq + 1) && (m_pktSeq - 1 != m_pktLastSeq + 1))) {
LogWarning(LOG_NET, "P25 Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
}
}
@ -360,7 +360,7 @@ void Network::clock(uint32_t ms)
else {
if (m_rxNXDNStreamId == streamId) {
if (m_pktSeq != 0U && m_pktLastSeq != 0U) {
if (m_pktSeq >= 1U && m_pktSeq != m_pktLastSeq + 1) {
if (m_pktSeq >= 1U && ((m_pktSeq != m_pktLastSeq + 1) && (m_pktSeq - 1 != m_pktLastSeq + 1))) {
LogWarning(LOG_NET, "NXDN Stream %u out-of-sequence; %u != %u", streamId, m_pktSeq, m_pktLastSeq + 1);
}
}

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.