From 562badf61c9c2e41b30026fc6ccfe08c91e547b1 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Wed, 21 Feb 2018 08:10:59 +0000 Subject: [PATCH] Icom protocol has no sequence number so cannot fill missing frames or count lost data. --- NXDNControl.cpp | 7 ++----- NXDNControl.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NXDNControl.cpp b/NXDNControl.cpp index 2886821..c1e3f90 100644 --- a/NXDNControl.cpp +++ b/NXDNControl.cpp @@ -58,7 +58,6 @@ m_networkWatchdog(1000U, 0U, 1500U), m_elapsed(), m_rfFrames(0U), m_netFrames(0U), -m_netLost(0U), m_rfErrs(0U), m_rfBits(1U), m_rfLastLICH(), @@ -755,7 +754,7 @@ void CNXDNControl::writeNetwork() if (type == NXDN_MESSAGE_TYPE_TX_REL) { m_netFrames++; - LogMessage("NXDN, received network end of transmission, %.1f seconds, %u%% packet loss", float(m_netFrames) / 12.5F, (m_netLost * 100U) / m_netFrames); + LogMessage("NXDN, received network end of transmission, %.1f seconds", float(m_netFrames) / 12.5F); writeEndNet(); } else if (type == NXDN_MESSAGE_TYPE_VCALL) { unsigned short srcId = m_netLayer3.getSourceUnitId(); @@ -771,7 +770,6 @@ void CNXDNControl::writeNetwork() m_elapsed.start(); m_netState = RS_NET_AUDIO; m_netFrames = 1U; - m_netLost = 0U; } else { CUtils::dump(2U, "NXDN, interesting non superblock network frame", netData, 33U); return; @@ -823,7 +821,6 @@ void CNXDNControl::writeNetwork() m_elapsed.start(); m_netState = RS_NET_AUDIO; m_netFrames = 1U; - m_netLost = 0U; // Create a dummy start message unsigned char start[NXDN_FRAME_LENGTH_BYTES + 2U]; @@ -917,7 +914,7 @@ void CNXDNControl::clock(unsigned int ms) m_networkWatchdog.clock(ms); if (m_networkWatchdog.hasExpired()) { - LogMessage("NXDN, network watchdog has expired, %.1f seconds, %u%% packet loss", float(m_netFrames) / 12.5F, (m_netLost * 100U) / m_netFrames); + LogMessage("NXDN, network watchdog has expired, %.1f seconds", float(m_netFrames) / 12.5F); writeEndNet(); } } diff --git a/NXDNControl.h b/NXDNControl.h index 4840854..01651d6 100644 --- a/NXDNControl.h +++ b/NXDNControl.h @@ -64,7 +64,6 @@ private: CStopWatch m_elapsed; unsigned int m_rfFrames; unsigned int m_netFrames; - unsigned int m_netLost; unsigned int m_rfErrs; unsigned int m_rfBits; CNXDNLICH m_rfLastLICH;