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

fix for ChainedMessage::checkId

Browse Source
This commit is contained in:
john30
2016-11-19 12:16:51 +01:00
parent c3b341d1ba
commit 93cfb4abda
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+2 -2
View File
@@ -838,14 +838,14 @@ bool ChainedMessage::checkId(Message& other)
return false; // chain prefix mismatch return false; // chain prefix mismatch
} }
vector< vector<unsigned char> > otherIds = ((ChainedMessage&)other).m_ids; vector< vector<unsigned char> > otherIds = ((ChainedMessage&)other).m_ids;
unsigned char chainPrefixLength = (unsigned char)m_id.size(); unsigned char chainPrefixLength = Message::getIdLength();
for (unsigned char checkIndex=0; checkIndex<m_ids.size(); checkIndex++) { // check suffix for each part for (unsigned char checkIndex=0; checkIndex<m_ids.size(); checkIndex++) { // check suffix for each part
vector<unsigned char> id = m_ids[checkIndex]; vector<unsigned char> id = m_ids[checkIndex];
for (unsigned char otherIndex=0; otherIndex<otherIds.size(); otherIndex++) { for (unsigned char otherIndex=0; otherIndex<otherIds.size(); otherIndex++) {
vector<unsigned char> otherId = otherIds[otherIndex]; vector<unsigned char> otherId = otherIds[otherIndex];
bool found = false; bool found = false;
for (unsigned char pos=chainPrefixLength; pos<idLen; pos++) { for (unsigned char pos=chainPrefixLength; pos<idLen; pos++) {
if (id[pos] != otherId[pos]) { if (id[2+pos] != otherId[2+pos]) {
found = false; found = false;
break; break;
} }