epoll: Handle EPOLLERR as 'readable'

When we use select(), an error event on a file descriptor causes it to
be reported as readable, and some of the handlers will only clean it up
if that happens. So set the 'readable' flag on EPOLLERR too.

This is part of #389.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/mainloop.c b/mainloop.c
index a459dfb95a17138dc29deef42d0aa1034a514d8e..4c2863fa682363697c47e73355c5689d6c1fe437 100644 (file)
--- a/mainloop.c
+++ b/mainloop.c
@@ -372,7 +372,7 @@ int openconnect_mainloop(struct openconnect_info *vpninfo,
                                nfds = 0;
                        }
                        while (nfds--) {
-                               if (evs[nfds].events & EPOLLIN) {
+                               if (evs[nfds].events & (EPOLLIN|EPOLLERR)) {
                                        if (evs[nfds].data.fd == vpninfo->tun_fd)
                                                tun_r = 1;
                                        else if (evs[nfds].data.fd == vpninfo->ssl_fd)