MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove content duplicate removal, use sequence numbers only.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-06-16 17:39:16 +01:00
parent 8df0eae8bb
commit b8ce945987
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
YSFControl.cpp
View File

@@ -48,7 +48,6 @@ m_netDest(NULL),
m_rfPayload(), m_rfPayload(),
m_netPayload(), m_netPayload(),
m_netSeqNo(0U), m_netSeqNo(0U),
m_netCsum(0U),
m_fp(NULL) m_fp(NULL)
{ {
assert(display != NULL); assert(display != NULL);
@@ -394,11 +393,11 @@ void CYSFControl::writeNetwork()
m_netErrs = 0U; m_netErrs = 0U;
m_netBits = 1U; m_netBits = 1U;
m_netSeqNo = 0U; m_netSeqNo = 0U;
m_netCsum = 0U;
} else { } else {
// Check for duplicate frames, if we can // Check for duplicate frames, if we can
// XXX this needs changing in the future
if (m_netSeqNo == data[34U] && m_netSeqNo != 0U) { if (m_netSeqNo == data[34U] && m_netSeqNo != 0U) {
LogDebug("YSF, removing network duplicate by sequence number - %u", data[34U] >> 1); LogDebug("YSF, removing network duplicate, seq %u", data[34U] >> 1);
return; return;
} }
@@ -437,19 +436,6 @@ void CYSFControl::writeNetwork()
unsigned char fi = fich.getFI(); unsigned char fi = fich.getFI();
unsigned char ft = fich.getFT(); unsigned char ft = fich.getFT();
// XXX temporary duplicate removal, remove when everyone has upgraded their MMDVM Host
unsigned int csum = 0U;
for (unsigned int i = 0U; i < YSF_FRAME_LENGTH_BYTES; i++)
csum += data[i + 35U];
if (csum == m_netCsum) {
LogDebug("YSF, removing network duplicate by content checksum - %u", csum);
return;
}
m_netCsum = csum;
// XXX temporary duplicate removal, remove when everyone has upgraded their MMDVM Host
// Set the downlink callsign // Set the downlink callsign
switch (fi) { switch (fi) {
case YSF_FI_HEADER: case YSF_FI_HEADER:

1
YSFControl.h
View File

@@ -65,7 +65,6 @@ private:
CYSFPayload m_rfPayload; CYSFPayload m_rfPayload;
CYSFPayload m_netPayload; CYSFPayload m_netPayload;
unsigned char m_netSeqNo; unsigned char m_netSeqNo;
unsigned int m_netCsum;
FILE* m_fp; FILE* m_fp;
void writeQueueRF(const unsigned char* data); void writeQueueRF(const unsigned char* data);