X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-12-bidir.c;h=e79acb56db1ce2d68d605b3419e6aa813c4b938c;hb=1d415706a6e948fe6dcc3b5dab45812b297f77a1;hp=10f84295cb8650e6c8566289b9467fd9608561a6;hpb=d8ecdc8021b532fe76f001290fcd79c4fb9e1323;p=ccan diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c index 10f84295..e79acb56 100644 --- a/ccan/io/test/run-12-bidir.c +++ b/ccan/io/test/run-12-bidir.c @@ -24,10 +24,20 @@ static void finish_ok(struct io_conn *conn, struct data *d) d->state++; } -static struct io_plan *rw_done(struct io_conn *conn, struct data *d) +static struct io_plan *r_done(struct io_conn *conn, struct data *d) { d->state++; - return io_halfclose(conn); + if (d->state == 3) + return io_close(conn); + return io_wait(conn, NULL, io_never, NULL); +} + +static struct io_plan *w_done(struct io_conn *conn, struct data *d) +{ + d->state++; + if (d->state == 3) + return io_close(conn); + return io_out_wait(conn, NULL, io_never, NULL); } static struct io_plan *init_conn(struct io_conn *conn, struct data *d) @@ -44,8 +54,8 @@ static struct io_plan *init_conn(struct io_conn *conn, struct data *d) io_set_finish(conn, finish_ok, d); return io_duplex(conn, - io_read(conn, d->buf, sizeof(d->buf), rw_done, d), - io_write(conn, d->wbuf, sizeof(d->wbuf), rw_done, d)); + io_read(conn, d->buf, sizeof(d->buf), r_done, d), + io_write(conn, d->wbuf, sizeof(d->wbuf), w_done, d)); } static int make_listen_fd(const char *port, struct addrinfo **info)