lib: correctly handle EOF when using poll()

Descriptor owner should handle EOF, not thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/thread.c b/lib/thread.c
index aef9ac5cf985f290837225652b90977444f5cf5e..6de4d24bfae883f86c2b88264d24e7c63fb44a62 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -1211,14 +1211,13 @@ check_pollfds(struct thread_master *m, fd_set *readfd, int num)
       ready++;
 
       /* POLLIN / POLLOUT process event */
-      if (m->handler.pfds[i].revents & POLLIN)
+      if (m->handler.pfds[i].revents & (POLLIN | POLLHUP))
         thread_process_fds_helper(m, m->read[m->handler.pfds[i].fd], NULL, POLLIN, i);
       if (m->handler.pfds[i].revents & POLLOUT)
         thread_process_fds_helper(m, m->write[m->handler.pfds[i].fd], NULL, POLLOUT, i);
 
       /* remove fd from list on POLLNVAL */
-      if (m->handler.pfds[i].revents & POLLNVAL ||
-          m->handler.pfds[i].revents & POLLHUP)
+      if (m->handler.pfds[i].revents & POLLNVAL)
         {
            memmove(m->handler.pfds+i,
                    m->handler.pfds+i+1,