file cleanup;

pull/134/head
Bryan Biedenkapp 5 days ago
parent 048de3ab55
commit fc59f50680

@ -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);
}
}

@ -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);

@ -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<void(const uint8_t*, uint32_t, uint32_t, uint32_t,
uint16_t, uint32_t, bool)>;
using FrameHandler = std::function<void(const uint8_t*, uint32_t, uint32_t, uint32_t, uint16_t, uint32_t, bool)>;
/**
* @brief Function invoked when ordered work cannot be scheduled.
*/

Loading…
Cancel
Save

Powered by TurnKey Linux.