X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FFileHandle.cc;h=bc8ea9caf21923dd77cdb2897f91116240ca2fe6;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=baafe7a58d5da16a14b0f508e5c34b367659c44a;hpb=10985d71f77b627bc4da543d7114feb7c4529329;p=senf.git

diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index baafe7a..bc8ea9c 100644
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -111,16 +111,16 @@ prefix_ void senf::FileBody::blocking(bool status)
 /* We don't take POLLIN/POLLOUT as argument to avoid having to include
    sys/poll.h in the .cci file (and therefore indirectly into the .hh
    and then every file which uses FileHandle) */
-prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block)
+prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, int timeout, bool oob)
     const
 {
     struct ::pollfd pfd;
     ::memset(&pfd,0,sizeof(pfd));
     pfd.fd = fd;
-    pfd.events = incoming?POLLIN:POLLOUT;
+    pfd.events = incoming?(oob?POLLPRI:POLLIN):POLLOUT;
     int rv = -1;
     do {
-        rv = ::poll(&pfd,1,block?-1:0);
+        rv = ::poll(&pfd,1,timeout);
         if (rv<0)
             switch (errno) {
             case EINTR: