io: io_set_alloc()

[ccan] / ccan / io / test / run-12-bidir.c

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 6dc94c8a4a57a1baee29d281b7e04355a7cd7752..1ab0a218d02a200e7918a079966d7eda941cd4c6 100644 (file)
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65012"
+#endif
+
 struct data {
        struct io_listener *l;
        int state;
@@ -21,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(conn, NULL);
+       return io_close();
 }
 
 static void init_conn(int fd, struct data *d)
@@ -35,10 +39,11 @@ static void init_conn(int fd, struct data *d)
 
        memset(d->wbuf, 7, sizeof(d->wbuf));
 
-       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
-                          finish_ok, d);
-       ok1(io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d),
-                     finish_ok, d));
+       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close_cb, d));
+       io_set_finish(conn, finish_ok, d);
+       conn = io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d));
+       ok1(conn);
+       io_set_finish(conn, finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -82,7 +87,7 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(10);
        d->state = 0;
-       fd = make_listen_fd("65012", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        d->l = io_new_listener(fd, init_conn, d);
        ok1(d->l);