moparisthebest/socat
1
0
Fork 0
mirror of https://github.com/moparisthebest/socat synced 2024-12-22 06:58:47 -05:00
Code Issues Releases Wiki Activity

MacOSX port: issue error when poll gives POLLNVAL

Browse Source
This commit is contained in:
Gerhard Rieger 2008-09-26 08:13:19 +02:00
parent 9922641b60
commit 8287a65d1a
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
socat.c
View File

@ -929,17 +929,36 @@ int _socat(void) {
} }
if (XIO_READABLE(sock1) && XIO_GETRDFD(sock1) >= 0 && if (XIO_READABLE(sock1) && XIO_GETRDFD(sock1) >= 0 &&
(fd1in->revents&(POLLIN|POLLHUP|POLLERR))) { (fd1in->revents /*&(POLLIN|POLLHUP|POLLERR)*/)) {
if (fd1in->revents & POLLNVAL) {
/* this is what we find on Mac OS X when poll()'ing on a device or
named pipe. a read() might imm. return with 0 bytes, resulting
in a loop? */
Error1("poll(...[%d]: invalid request", fd1in->fd);
return -1;
}
mayrd1 = true; mayrd1 = true;
} }
if (XIO_READABLE(sock2) && XIO_GETRDFD(sock2) >= 0 && if (XIO_READABLE(sock2) && XIO_GETRDFD(sock2) >= 0 &&
(fd2in->revents&(POLLIN|POLLHUP|POLLERR))) { (fd2in->revents)) {
if (fd2in->revents & POLLNVAL) {
Error1("poll(...[%d]: invalid request", fd2in->fd);
return -1;
}
mayrd2 = true; mayrd2 = true;
} }
if (XIO_GETWRFD(sock1) >= 0 && (fd1out->revents&(POLLOUT|POLLHUP|POLLERR))) { if (XIO_GETWRFD(sock1) >= 0 && (fd1out->revents)) {
if (fd1out->revents & POLLNVAL) {
Error1("poll(...[%d]: invalid request", fd1out->fd);
return -1;
}
maywr1 = true; maywr1 = true;
} }
if (XIO_GETWRFD(sock2) >= 0 && (fd2out->revents&(POLLOUT|POLLHUP|POLLERR))) { if (XIO_GETWRFD(sock2) >= 0 && (fd2out->revents)) {
if (fd2out->revents & POLLNVAL) {
Error1("poll(...[%d]: invalid request", fd2out->fd);
return -1;
}
maywr2 = true; maywr2 = true;
} }