diff --git a/src/common/network/BaseNetwork.cpp b/src/common/network/BaseNetwork.cpp index 32304bbc..9afb312c 100644 --- a/src/common/network/BaseNetwork.cpp +++ b/src/common/network/BaseNetwork.cpp @@ -731,7 +731,7 @@ uint16_t BaseNetwork::pktSeq(bool reset) uint16_t curr = m_pktSeq; ++m_pktSeq; - if (m_pktSeq >= RTP_END_OF_CALL_SEQ - 1U) { + if (m_pktSeq > (RTP_END_OF_CALL_SEQ - 1U)) { m_pktSeq = 0U; } diff --git a/src/fne/network/DiagNetwork.cpp b/src/fne/network/DiagNetwork.cpp index 442467e1..cbb29d45 100644 --- a/src/fne/network/DiagNetwork.cpp +++ b/src/fne/network/DiagNetwork.cpp @@ -188,14 +188,14 @@ void* DiagNetwork::threadedNetworkRx(void* arg) connection->pktLastSeq(pktSeq); connection->pktNextSeq(0U); } else { - if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq())) { + if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) { LogWarning(LOG_NET, "PEER %u stream %u out-of-sequence; %u != %u", peerId, streamId, pktSeq, connection->pktNextSeq()); } connection->currStreamId(streamId); connection->pktLastSeq(pktSeq); connection->pktNextSeq(pktSeq + 1); - if (connection->pktNextSeq() > UINT16_MAX) { + if (connection->pktNextSeq() > (RTP_END_OF_CALL_SEQ - 1U)) { connection->pktNextSeq(0U); } } diff --git a/src/fne/network/FNENetwork.cpp b/src/fne/network/FNENetwork.cpp index 8814062e..c53e975d 100644 --- a/src/fne/network/FNENetwork.cpp +++ b/src/fne/network/FNENetwork.cpp @@ -366,14 +366,14 @@ void* FNENetwork::threadedNetworkRx(void* arg) connection->pktLastSeq(pktSeq); connection->pktNextSeq(0U); } else { - if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq())) { + if ((connection->currStreamId() == streamId) && (pktSeq != connection->pktNextSeq()) && (pktSeq != (RTP_END_OF_CALL_SEQ - 1U))) { LogWarning(LOG_NET, "PEER %u stream %u out-of-sequence; %u != %u", peerId, streamId, pktSeq, connection->pktNextSeq()); } connection->currStreamId(streamId); connection->pktLastSeq(pktSeq); connection->pktNextSeq(pktSeq + 1); - if (connection->pktNextSeq() > UINT16_MAX) { + if (connection->pktNextSeq() > (RTP_END_OF_CALL_SEQ - 1U)) { connection->pktNextSeq(0U); } }