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

don't check hangup too early

Browse Source
This commit is contained in:
John
2021-11-13 13:49:53 +01:00
parent ab5ed3d9bf
commit dd1a051511
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/ebusctl.cpp
+6 -3
View File
@@ -138,7 +138,7 @@ string fetchData(ebusd::TCPSocket* socket, bool listening, uint16_t timeout) {
ostringstream ostream; ostringstream ostream;
string message, sendmessage; string message, sendmessage;
int ret; int ret = 0;
struct timespec tdiff; struct timespec tdiff;
// set timeout // set timeout
@@ -175,10 +175,13 @@ string fetchData(ebusd::TCPSocket* socket, bool listening, uint16_t timeout) {
while (time(&now) && now < endTime) { while (time(&now) && now < endTime) {
#ifdef HAVE_PPOLL #ifdef HAVE_PPOLL
// check previous hangup
if (ret > 0 && ((fds[0].revents & (POLLHUP | POLLRDHUP)) || (fds[1].revents & (POLLHUP | POLLRDHUP)))) {
break; // remote hung up
}
// wait for new fd event // wait for new fd event
ret = ppoll(fds, nfds, &tdiff, nullptr); ret = ppoll(fds, nfds, &tdiff, nullptr);
if (ret < 0 || (fds[0].revents & (POLLERR | POLLHUP | POLLRDHUP)) if (ret < 0 || (ret > 0 && ((fds[0].revents & POLLERR) || (fds[1].revents & POLLERR)))) {
|| (fds[1].revents & (POLLERR | POLLHUP | POLLRDHUP))) {
break; break;
} }
#else #else