From 962744ab50d092b069420cffdfb1af54efd862c1 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Fri, 28 Jul 2023 13:18:49 -0400 Subject: [PATCH] alter out-of-sequence warnings to be less noisy; --- src/network/Network.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/network/Network.cpp b/src/network/Network.cpp index 1369cd30..a74c94e4 100644 --- a/src/network/Network.cpp +++ b/src/network/Network.cpp @@ -302,8 +302,10 @@ void Network::clock(uint32_t ms) } else { if (m_rxDMRStreamId[slotNo] == streamId) { - if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) { - LogWarning(LOG_NET, "DMR Stream %u out-of-sequence; %u != %u", streamId, 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); + } } } /* @@ -331,8 +333,10 @@ void Network::clock(uint32_t ms) } else { if (m_rxP25StreamId == streamId) { - if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) { - LogWarning(LOG_NET, "P25 Stream %u out-of-sequence; %u != %u", streamId, 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); + } } } /* @@ -360,8 +364,10 @@ void Network::clock(uint32_t ms) } else { if (m_rxNXDNStreamId == streamId) { - if (m_pktLastSeq != 0U && m_pktSeq != m_pktLastSeq + 1) { - LogWarning(LOG_NET, "NXDN Stream %u out-of-sequence; %u != %u", streamId, 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); + } } } /*