dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

On Posix: Don't shutdown (half) the connection from the client. 

This triggered POLLHUP too early on Mac.
This commit is contained in:
Mara Bos 2018-11-14 17:04:17 +01:00 committed by Julian Oes
parent d7c34ddee4
commit c882ca9389
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platforms/posix/src/px4_daemon/client.cpp
View File

@ -124,12 +124,6 @@ Client::_send_cmds(const int argc, const char **argv)
buf += n_sent;
}
// Let the server know we're done writing.
if (shutdown(_fd, SHUT_WR) < 0) {
PX4_ERR("shutdown() failed: %s", strerror(errno));
return -1;
}
return 0;
}

5
platforms/posix/src/px4_daemon/server.cpp
View File

@ -220,14 +220,15 @@ void
cmd.resize(n + 1024);
ssize_t n_read = read(fd, &cmd[n], cmd.size() - n);
if (n_read < 0) {
if (n_read <= 0) {
_cleanup(fd);
return nullptr;
}
cmd.resize(n + n_read);
if (n_read == 0) {
// Command ends in 0x00 (no tty) or 0x01 (tty).
if (!cmd.empty() && cmd.back() < 2) {
break;
}
}