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

alter out-of-sequence warnings to be less noisy;

Browse Source
pull/39/head
Bryan Biedenkapp 3 years ago
parent ed9ee36507
commit 962744ab50
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/network/Network.cpp
Unescape View File

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

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.