io: closing one side of a duplex connection closes both.

Otherwise, it's a PITA to close a duplexed connection.  If necessary we
can introduce a half-close to de-deplex later.

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

diff --git a/ccan/io/io.c b/ccan/io/io.c
index f45589c0fac71888b1be312debcb3ec04597b0bb..b74520444353761451529af0d0467522293f2686 100644 (file)
--- a/ccan/io/io.c
+++ b/ccan/io/io.c
@@ -46,6 +46,12 @@ struct io_plan io_debug(struct io_plan plan)
        current->plan = plan;
        backend_plan_changed(current);
 
+       /* If it closed, close duplex. */
+       if (!current->plan.next && current->duplex) {
+               current->duplex->plan = io_close_();
+               backend_plan_changed(current->duplex);
+       }
+
        /* Call back into the loop immediately. */
        io_loop_return = do_io_loop(&ready);
 
@@ -441,6 +447,14 @@ void io_ready(struct io_conn *conn)
                backend_plan_changed(conn);
        }
        set_current(NULL);
+
+       /* If it closed, close duplex. */
+       if (!conn->plan.next && conn->duplex) {
+               set_current(conn->duplex);
+               conn->duplex->plan = io_close();
+               backend_plan_changed(conn->duplex);
+               set_current(NULL);
+       }
 }
 
 /* Close the connection, we're done. */

diff --git a/ccan/io/io.h b/ccan/io/io.h
index 6248fec02c2e5c5ae3d42e65d80eb8483af1d5aa..0318aef300873fa71104e0a2b630ad28e93e7065 100644 (file)
--- a/ccan/io/io.h
+++ b/ccan/io/io.h
@@ -394,7 +394,7 @@ bool io_timeout_(struct io_conn *conn, struct timespec ts,
  * to have two connections for the same fd, and use one for read
  * operations and one for write.
  *
- * You must io_close() both of them to close the fd.
+ * Returning io_close() on one will close both fds!
  *
  * Example:
  *     static void setup_read_write(int fd,

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 1ab0a218d02a200e7918a079966d7eda941cd4c6..f7a0ecab7f3871045458e4886c6653e865f0ec5f 100644 (file)
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -25,7 +25,7 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 static struct io_plan write_done(struct io_conn *conn, struct data *d)
 {
        d->state++;
-       return io_close();
+       return io_idle();
 }
 
 static void init_conn(int fd, struct data *d)