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

do not register own master address during send

Browse Source
This commit is contained in:
john30
2017-04-17 19:27:52 +02:00
parent 47ed6dde3f
commit b77e0d092c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+4 -2
View File
@@ -277,7 +277,7 @@ bool GrabbedMessage::dump(const bool unknown, MessageMap* messages, bool first,
if (!types) { if (!types) {
return true; return true;
} }
bool master = isMaster(dstAddress) || dstAddress == BROADCAST || m_lastSlave.size() <= 1 || m_lastSlave[0] == 0; bool master = isMaster(dstAddress) || dstAddress == BROADCAST || m_lastSlave.getDataSize() <= 0;
SymbolString *input; SymbolString *input;
if (master) { if (master) {
input = &m_lastMaster; input = &m_lastMaster;
@@ -1030,7 +1030,9 @@ void BusHandler::receiveCompleted() {
logError(lf_bus, "invalid self-addressed message from %2.2x", srcAddress); logError(lf_bus, "invalid self-addressed message from %2.2x", srcAddress);
return; return;
} }
addSeenAddress(srcAddress); if (!m_currentRequest) {
addSeenAddress(srcAddress);
}
addSeenAddress(dstAddress); addSeenAddress(dstAddress);
bool master = isMaster(dstAddress); bool master = isMaster(dstAddress);