nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use length field for determining decodable bytes

Browse Source
This commit is contained in:
john30
2017-02-23 18:09:18 +01:00
parent ae58a2a737
commit 3780aca37d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+8 -2
View File
@@ -275,10 +275,16 @@ bool GrabbedMessage::dump(const bool unknown, MessageMap* messages, bool first,
SymbolString *input = master ? &m_lastMaster : &m_lastSlave; SymbolString *input = master ? &m_lastMaster : &m_lastSlave;
unsigned char baseOffset = master ? 5 : 1; unsigned char baseOffset = master ? 5 : 1;
unsigned char remain = input->size(); unsigned char remain = input->size();
if (remain <= baseOffset+1) { // excluding CRC if (remain <= baseOffset) {
return true;
}
remain = (unsigned char)(remain-baseOffset);
if ((*input)[baseOffset-1] < remain) {
remain = (*input)[baseOffset-1];
}
if (remain == 0) {
return true; return true;
} }
remain = (unsigned char)(remain-baseOffset-1);
for (map<string, DataType*>::const_iterator it = types->begin(); it != types->end(); it++) { for (map<string, DataType*>::const_iterator it = types->begin(); it != types->end(); it++) {
DataType* baseType = it->second; DataType* baseType = it->second;
if ((baseType->getBitCount() % 8) != 0 || baseType->isIgnored()) { // skip bit and ignored types if ((baseType->getBitCount() % 8) != 0 || baseType->isIgnored()) { // skip bit and ignored types