dominic/YSFClients
1
0
Fork 0
Code Releases Activity

Merge pull request #114 from juribeparada/master

Browse source 
Fix for decoding long Wires-X commands
This commit is contained in:
Jonathan Naylor 2018-08-03 06:48:03 +01:00 • committed by GitHub
commit 6afcebf49e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
YSFGateway/WiresX.cpp
View file

@ -200,11 +200,11 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
if (!valid) if (!valid)
return WXS_NONE; return WXS_NONE;
} else { } else {
bool valid = payload.readDataFRModeData1(data, m_command + (fn - 1U) * 20U + 0U); bool valid = payload.readDataFRModeData1(data, m_command + (fn - 2U) * 40U + 20U);
if (!valid) if (!valid)
return WXS_NONE; return WXS_NONE;
valid = payload.readDataFRModeData2(data, m_command + (fn - 1U) * 20U + 20U); valid = payload.readDataFRModeData2(data, m_command + (fn - 2U) * 40U + 40U);
if (!valid) if (!valid)
return WXS_NONE; return WXS_NONE;
} }
@ -213,7 +213,8 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
bool valid = false; bool valid = false;
// Find the end marker // Find the end marker
for (unsigned int i = fn * 20U; i > 0U; i--) { unsigned int cmd_len = (fn - 1U) * 40U + 20U;
for (unsigned int i = cmd_len; i > 0U; i--) {
if (m_command[i] == 0x03U) { if (m_command[i] == 0x03U) {
unsigned char crc = CCRC::addCRC(m_command, i + 1U); unsigned char crc = CCRC::addCRC(m_command, i + 1U);
if (crc == m_command[i + 1U]) if (crc == m_command[i + 1U])
@ -237,7 +238,7 @@ WX_STATUS CWiresX::process(const unsigned char* data, const unsigned char* sourc
processDisconnect(source); processDisconnect(source);
return WXS_DISCONNECT; return WXS_DISCONNECT;
} else { } else {
CUtils::dump("Unknown Wires-X command", m_command, fn * 20U); CUtils::dump("Unknown Wires-X command", m_command, cmd_len);
return WXS_NONE; return WXS_NONE;
} }
} }