io: handle errors on listening file descriptors.

[ccan] / ccan / io / poll.c

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index bd481e9417a835b8f44291b87682a26d750a647d..229f7ce9ab4e6fb9bf69ccfd7ae5b650a4463613 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -157,11 +157,12 @@ void backend_wake(const void *wait)
        }
 }
 
-static void destroy_conn(struct io_conn *conn)
+static void destroy_conn(struct io_conn *conn, bool close_fd)
 {
        int saved_errno = errno;
 
-       close(conn->fd.fd);
+       if (close_fd)
+               close(conn->fd.fd);
        del_fd(&conn->fd);
        /* In case it's on always list, remove it. */
        list_del_init(&conn->always);
@@ -173,14 +174,26 @@ static void destroy_conn(struct io_conn *conn)
        }
 }
 
+static void destroy_conn_close_fd(struct io_conn *conn)
+{
+       destroy_conn(conn, true);
+}
+
 bool add_conn(struct io_conn *c)
 {
        if (!add_fd(&c->fd, 0))
                return false;
-       tal_add_destructor(c, destroy_conn);
+       tal_add_destructor(c, destroy_conn_close_fd);
        return true;
 }
 
+struct io_plan *io_close_taken_fd(struct io_conn *conn)
+{
+       tal_del_destructor(conn, destroy_conn_close_fd);
+       destroy_conn(conn, false);
+       return io_close(conn);
+}
+
 static void accept_conn(struct io_listener *l)
 {
        int fd = accept(l->fd.fd, NULL, NULL);
@@ -269,9 +282,14 @@ void *io_loop(struct timers *timers, struct timer **expired)
                                break;
 
                        if (fds[i]->listener) {
+                               struct io_listener *l = (void *)fds[i];
                                if (events & POLLIN) {
-                                       accept_conn((void *)c);
+                                       accept_conn(l);
+                                       r--;
+                               } else if (events & (POLLHUP|POLLNVAL|POLLERR)) {
                                        r--;
+                                       errno = EBADF;
+                                       io_close_listener(l);
                                }
                        } else if (events & (POLLIN|POLLOUT)) {
                                r--;