X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Fpoll.c;h=043feff74046226e61c367ad68644f3aba3fb54e;hb=319dadd4fa7af3f75b15bcb4f33b33f65d87a523;hp=bd481e9417a835b8f44291b87682a26d750a647d;hpb=ce27b5647d5065c05db04c67e51574253275a3c2;p=ccan

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index bd481e94..043feff7 100644
--- 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,25 @@ 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;
 }
 
+void cleanup_conn_without_close(struct io_conn *conn)
+{
+	tal_del_destructor(conn, destroy_conn_close_fd);
+	destroy_conn(conn, false);
+}
+
 static void accept_conn(struct io_listener *l)
 {
 	int fd = accept(l->fd.fd, NULL, NULL);
@@ -269,9 +281,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--;