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 the CRC processing from the networking side.

Browse Source
This commit is contained in:
Jonathan Naylor
2020-10-25 13:15:51 +00:00
parent 2ff0e52558
commit 9c13baef82
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
M17Network.cpp
View File

@@ -20,7 +20,6 @@
#include "M17Defines.h"
#include "M17Utils.h"
#include "Defines.h"
#include "M17CRC.h"
#include "Utils.h"
#include "Log.h"
@@ -125,8 +124,9 @@ bool CM17Network::write(const unsigned char* data)
::memcpy(buffer + 6U, data, 46U);
// Add the CRC
CM17CRC::encodeCRC(buffer + 6U, M17_LICH_LENGTH_BYTES + M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES);
// Dummy CRC
buffer[52U] = 0x00U;
buffer[53U] = 0x00U;
if (m_debug)
CUtils::dump(1U, "M17 data transmitted", buffer, 54U);
@@ -212,17 +212,10 @@ void CM17Network::clock(unsigned int ms)
return;
}
// Check the CRC
bool valid = CM17CRC::checkCRC(buffer + 6U, M17_LICH_LENGTH_BYTES + M17_FN_LENGTH_BYTES + M17_PAYLOAD_LENGTH_BYTES + M17_CRC_LENGTH_BYTES);
if (!valid) {
LogMessage("M17, network packet received with an invalid CRC");
return;
}
unsigned char c = length - 6U;
m_buffer.addData(&c, 1U);
m_buffer.addData(buffer + 6U, length - 8U);
m_buffer.addData(buffer + 6U, length - 6U);
}
bool CM17Network::read(unsigned char* data)