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

notify starting request when receiving back own master address timed out

Browse Source
This commit is contained in:
john30
2015-11-07 15:22:12 +01:00
parent 15e1bd9f7b
commit d402325a16
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/bushandler.cpp
+5 -1
View File
@@ -338,7 +338,8 @@ result_t BusHandler::handleSymbol()
unsigned char recvSymbol; unsigned char recvSymbol;
result = m_device->recv(timeout, recvSymbol); result = m_device->recv(timeout, recvSymbol);
if (!sending && result == RESULT_ERR_TIMEOUT && m_generateSynInterval > 0 && timeout >= m_generateSynInterval && (m_state == bs_noSignal || m_state == bs_skip)) { if (!sending && result == RESULT_ERR_TIMEOUT && m_generateSynInterval > 0
&& timeout >= m_generateSynInterval && (m_state == bs_noSignal || m_state == bs_skip)) {
// check if acting as AUTO-SYN generator is required // check if acting as AUTO-SYN generator is required
result = m_device->send(SYN); result = m_device->send(SYN);
if (result == RESULT_OK) { if (result == RESULT_OK) {
@@ -362,6 +363,9 @@ result_t BusHandler::handleSymbol()
time_t now; time_t now;
time(&now); time(&now);
if (result != RESULT_OK) { if (result != RESULT_OK) {
if (sending && startRequest != NULL && m_nextRequests.remove(startRequest)) {
m_currentRequest = startRequest; // force the failed request to be notified
}
if ((m_generateSynInterval != SYN_TIMEOUT && difftime(now, m_lastReceive) > 1) // at least one full second has passed since last received symbol if ((m_generateSynInterval != SYN_TIMEOUT && difftime(now, m_lastReceive) > 1) // at least one full second has passed since last received symbol
|| m_state == bs_noSignal) || m_state == bs_noSignal)
return setState(bs_noSignal, result); return setState(bs_noSignal, result);