io: make io_close_taken_fd() unset nonblocking on the fd.

This is what users want, and expect: as demonstrated by the test failure
when not under valgrind!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 090bff6fb92bf987520d5a94d72a86de92f20036..3e158a3669174b60ad766b060fd85eb15294b4ab 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -73,6 +73,7 @@ bool add_listener(struct io_listener *l);
 bool add_conn(struct io_conn *c);
 bool add_duplex(struct io_conn *c);
 void del_listener(struct io_listener *l);
+void cleanup_conn_without_close(struct io_conn *c);
 void backend_new_always(struct io_conn *conn);
 void backend_new_plan(struct io_conn *conn);
 void remove_from_always(struct io_conn *conn);

diff --git a/ccan/io/io.c b/ccan/io/io.c
index 4c41c93a683214fd24b50a647a94b31706d98017..68b95e82467194f13e87302e907cda5020fe37db 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -421,6 +421,14 @@ struct io_plan *io_close_cb(struct io_conn *conn, void *next_arg)
        return io_close(conn);
 }
 
+struct io_plan *io_close_taken_fd(struct io_conn *conn)
+{
+       set_blocking(conn->fd.fd, true);
+
+       cleanup_conn_without_close(conn);
+       return io_close(conn);
+}
+
 /* Exit the loop, returning this (non-NULL) arg. */
 void io_break(const void *ret)
 {

diff --git a/ccan/io/io.h b/ccan/io/io.h
index 54300ce4575ba684389c93c478afa16d8b4d1e6b..1664df65f26e353120762f1ab89abc65ee01f1c9 100644 (file)
--- a/ccan/io/io.h
+++ b/ccan/io/io.h
@@ -630,12 +630,14 @@ struct io_plan *io_close_cb(struct io_conn *, void *unused);
 
 /**
  * io_close_taken_fd - close a connection, but remove the filedescriptor first.
- * @conn: the connection to take the file descriptor from and close,
+ * @conn: the connection to take the file descriptor from and close.
  *
  * io_close closes the file descriptor underlying the io_conn; this version does
  * not.  Presumably you have used io_conn_fd() on it beforehand and will take
  * care of the fd yourself.
  *
+ * Note that this also turns off O_NONBLOCK on the fd.
+ *
  * Example:
  * static struct io_plan *steal_fd(struct io_conn *conn, int *fd)
  * {
@@ -664,7 +666,10 @@ void *io_loop(struct timers *timers, struct timer **expired);
  * io_conn_fd - get the fd from a connection.
  * @conn: the connection.
  *
- * Sometimes useful, eg for getsockname().
+ * Sometimes useful, eg for getsockname().  Note that the fd is O_NONBLOCK.
+ *
+ * See Also:
+ *     io_close_taken_fd
  */
 int io_conn_fd(const struct io_conn *conn);
 

diff --git a/ccan/io/poll.c b/ccan/io/poll.c
index 229f7ce9ab4e6fb9bf69ccfd7ae5b650a4463613..043feff74046226e61c367ad68644f3aba3fb54e 100644 (file)
--- a/ccan/io/poll.c
+++ b/ccan/io/poll.c
@@ -187,11 +187,10 @@ bool add_conn(struct io_conn *c)
        return true;
 }
 
-struct io_plan *io_close_taken_fd(struct io_conn *conn)
+void cleanup_conn_without_close(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)