Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Icom protocol has no sequence number so cannot fill missing frames or count lost

Browse source 
data.
This commit is contained in:
Jonathan Naylor 2018-02-21 08:10:59 +00:00
parent 7696add241
commit 562badf61c
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
NXDNControl.cpp
View file

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

1
NXDNControl.h
View file

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