do not consider active call or call counts for parrot;

r05a04_dev
Bryan Biedenkapp 3 days ago
parent 9f08ed1203
commit d68fffad97

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

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

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

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

Loading…
Cancel
Save

Powered by TurnKey Linux.