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

fix for readonly, immediately give up reading on send error or device error

Browse Source
This commit is contained in:
john30
2015-05-14 11:43:23 +02:00
parent f4d967f3c3
commit 071d57f957
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+4 -1
View File
@@ -156,7 +156,7 @@ result_t BusHandler::sendAndWait(SymbolString& master, SymbolString& slave)
if (result == RESULT_OK) if (result == RESULT_OK)
break; break;
if (!success || result == RESULT_ERR_NO_SIGNAL) { if (!success || result == RESULT_ERR_NO_SIGNAL || result == RESULT_ERR_SEND || result == RESULT_ERR_DEVICE) {
logError(lf_bus, "%s, give up", getResultCode(result)); logError(lf_bus, "%s, give up", getResultCode(result));
break; break;
} }
@@ -316,6 +316,9 @@ result_t BusHandler::handleSymbol()
else { else {
sending = false; sending = false;
timeout = SYN_TIMEOUT; timeout = SYN_TIMEOUT;
if (startRequest != NULL && m_nextRequests.remove(startRequest)) {
m_currentRequest = startRequest; // force the failed request to be notified
}
setState(bs_skip, result); setState(bs_skip, result);
} }
} }