From fc59f5068059af3a5efb80eaa811176a754d9396 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 7 Nov 2026 11:15:26 -0500 Subject: [PATCH] file cleanup; --- src/fne/HostFNE.cpp | 3 +-- src/fne/network/TrafficNetwork.cpp | 8 ++++---- src/fne/network/callhandler/OrderedFrameQueue.h | 5 +++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fne/HostFNE.cpp b/src/fne/HostFNE.cpp index 3e2176eb..98554169 100644 --- a/src/fne/HostFNE.cpp +++ b/src/fne/HostFNE.cpp @@ -1233,8 +1233,7 @@ void HostFNE::processPeerNXDN(network::PeerNetwork* peerNetwork, const uint8_t* // process NXDN data if (length > 0U) { uint32_t peerId = peerNetwork->getPeerId(); - m_network->nxdnTrafficHandler()->enqueueFrame(data, length, peerId, rtpHeader.getSSRC(), - rtpHeader.getSequence(), streamId, true); + m_network->nxdnTrafficHandler()->enqueueFrame(data, length, peerId, rtpHeader.getSSRC(), rtpHeader.getSequence(), streamId, true); } } diff --git a/src/fne/network/TrafficNetwork.cpp b/src/fne/network/TrafficNetwork.cpp index e346b708..091d053f 100644 --- a/src/fne/network/TrafficNetwork.cpp +++ b/src/fne/network/TrafficNetwork.cpp @@ -694,17 +694,17 @@ void TrafficNetwork::processNetwork() m_healthTasksSubmitted.fetch_add(1U, std::memory_order_relaxed); + // determine if the protocol requires ordered delivery const uint8_t subFunc = fneHeader.getSubFunction(); const bool orderedProtocol = fneHeader.getFunction() == NET_FUNC::PROTOCOL && - (subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_DMR || - subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_P25 || - subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_P25_P2 || - subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_NXDN); + (subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_DMR || subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_P25 || + subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_P25_P2 || subFunc == NET_SUBFUNC::PROTOCOL_SUBFUNC_NXDN); if (orderedProtocol) { processNetworkRx(req); return; } + // enqueue the task for unordered protocols if (!m_threadPool.enqueue(new_pooltask(taskNetworkRx, req))) { m_healthTaskEnqueueFailures.fetch_add(1U, std::memory_order_relaxed); m_healthTasksCompleted.fetch_add(1U, std::memory_order_relaxed); diff --git a/src/fne/network/callhandler/OrderedFrameQueue.h b/src/fne/network/callhandler/OrderedFrameQueue.h index a442ffa9..5b0c0b36 100644 --- a/src/fne/network/callhandler/OrderedFrameQueue.h +++ b/src/fne/network/callhandler/OrderedFrameQueue.h @@ -4,6 +4,8 @@ * GPLv2 Open Source. Use is subject to license terms. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * + * Copyright (C) 2026 Bryan Biedenkapp, N2PLL + * */ /** * @file OrderedFrameQueue.h @@ -40,8 +42,7 @@ namespace network /** * @brief Function invoked to process one ordered frame. */ - using FrameHandler = std::function; + using FrameHandler = std::function; /** * @brief Function invoked when ordered work cannot be scheduled. */