From d68fffad971bc92abbbeb4e656dd03f8d72aec92 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 2 Feb 2026 13:17:34 -0500 Subject: [PATCH] do not consider active call or call counts for parrot; --- src/fne/network/callhandler/TagAnalogData.cpp | 14 +++++++++----- src/fne/network/callhandler/TagDMRData.cpp | 14 +++++++++----- src/fne/network/callhandler/TagNXDNData.cpp | 14 +++++++++----- src/fne/network/callhandler/TagP25Data.cpp | 14 +++++++++----- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/fne/network/callhandler/TagAnalogData.cpp b/src/fne/network/callhandler/TagAnalogData.cpp index 1773c4ce..acc80193 100644 --- a/src/fne/network/callhandler/TagAnalogData.cpp +++ b/src/fne/network/callhandler/TagAnalogData.cpp @@ -127,9 +127,11 @@ bool TagAnalogData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee else if (!fromUpstream) LogInfoEx(LOG_MASTER, CALL_END_LOG); - m_network->m_totalActiveCalls--; - if (m_network->m_totalActiveCalls < 0) - m_network->m_totalActiveCalls = 0; + if (!tg.config().parrot()) { + m_network->m_totalActiveCalls--; + if (m_network->m_totalActiveCalls < 0) + m_network->m_totalActiveCalls = 0; + } // report call event to InfluxDB if (m_network->m_enableInfluxDB) { @@ -269,8 +271,10 @@ bool TagAnalogData::processFrame(const uint8_t* data, uint32_t len, uint32_t pee m_status[dstId].activeCall = true; m_status.unlock(); - m_network->m_totalCallsProcessed++; - m_network->m_totalActiveCalls++; + if (!tg.config().parrot()) { + m_network->m_totalCallsProcessed++; + m_network->m_totalActiveCalls++; + } #define CALL_START_LOG "Analog, Call Start, peer = %u, ssrc = %u, srcId = %u, dstId = %u, streamId = %u, fromUpstream = %u", peerId, ssrc, srcId, dstId, streamId, fromUpstream if (m_network->m_logUpstreamCallStartEnd && fromUpstream) diff --git a/src/fne/network/callhandler/TagDMRData.cpp b/src/fne/network/callhandler/TagDMRData.cpp index 53941353..d80d08ba 100644 --- a/src/fne/network/callhandler/TagDMRData.cpp +++ b/src/fne/network/callhandler/TagDMRData.cpp @@ -207,9 +207,11 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId LogInfoEx(LOG_MASTER, CALL_END_LOG); } - m_network->m_totalActiveCalls--; - if (m_network->m_totalActiveCalls < 0) - m_network->m_totalActiveCalls = 0; + if (!tg.config().parrot()) { + m_network->m_totalActiveCalls--; + if (m_network->m_totalActiveCalls < 0) + m_network->m_totalActiveCalls = 0; + } // report call event to InfluxDB if (m_network->m_enableInfluxDB) { @@ -370,8 +372,10 @@ bool TagDMRData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId m_status[dstId].activeCall = true; m_status.unlock(); - m_network->m_totalCallsProcessed++; - m_network->m_totalActiveCalls++; + if (!tg.config().parrot()) { + m_network->m_totalCallsProcessed++; + m_network->m_totalActiveCalls++; + } // is this a private call? if (flco == FLCO::PRIVATE) { diff --git a/src/fne/network/callhandler/TagNXDNData.cpp b/src/fne/network/callhandler/TagNXDNData.cpp index 4a6d3eb8..27001e9e 100644 --- a/src/fne/network/callhandler/TagNXDNData.cpp +++ b/src/fne/network/callhandler/TagNXDNData.cpp @@ -246,9 +246,11 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI LogInfoEx(LOG_MASTER, CALL_END_LOG); } - m_network->m_totalActiveCalls--; - if (m_network->m_totalActiveCalls < 0) - m_network->m_totalActiveCalls = 0; + if (!tg.config().parrot()) { + m_network->m_totalActiveCalls--; + if (m_network->m_totalActiveCalls < 0) + m_network->m_totalActiveCalls = 0; + } // report call event to InfluxDB if (m_network->m_enableInfluxDB) { @@ -406,8 +408,10 @@ bool TagNXDNData::processFrame(const uint8_t* data, uint32_t len, uint32_t peerI m_status[dstId].activeCall = true; m_status.unlock(); - m_network->m_totalCallsProcessed++; - m_network->m_totalActiveCalls++; + if (!tg.config().parrot()) { + m_network->m_totalCallsProcessed++; + m_network->m_totalActiveCalls++; + } // is this a private call? if (!group) { diff --git a/src/fne/network/callhandler/TagP25Data.cpp b/src/fne/network/callhandler/TagP25Data.cpp index af7f2295..61072329 100644 --- a/src/fne/network/callhandler/TagP25Data.cpp +++ b/src/fne/network/callhandler/TagP25Data.cpp @@ -296,9 +296,11 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId LogInfoEx(LOG_MASTER, CALL_END_LOG); } - m_network->m_totalActiveCalls--; - if (m_network->m_totalActiveCalls < 0) - m_network->m_totalActiveCalls = 0; + if (!tg.config().parrot()) { + m_network->m_totalActiveCalls--; + if (m_network->m_totalActiveCalls < 0) + m_network->m_totalActiveCalls = 0; + } // report call event to InfluxDB if (m_network->m_enableInfluxDB) { @@ -463,8 +465,10 @@ bool TagP25Data::processFrame(const uint8_t* data, uint32_t len, uint32_t peerId m_status[dstId].activeCall = true; m_status.unlock(); - m_network->m_totalCallsProcessed++; - m_network->m_totalActiveCalls++; + if (!tg.config().parrot()) { + m_network->m_totalCallsProcessed++; + m_network->m_totalActiveCalls++; + } // is this a private call? if (lco == LCO::PRIVATE) {