ccan/io: generic init function for listening connections.

[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 0cafb4f2454ac0f17bf489dc974129db82a96bca..3534bc3138f92df5aa6bb57e51849aac26ac6f3b 100644 (file)
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -21,7 +21,7 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 static struct io_plan write_out(struct io_conn *conn, struct data *d)
 {
        d->state++;
-       return io_write(conn, d->wbuf, sizeof(d->wbuf), io_close, d);
+       return io_write(d->wbuf, sizeof(d->wbuf), io_close, d);
 }
 
 static struct io_plan start_ok(struct io_conn *conn, struct data *d)
@@ -33,7 +33,13 @@ static struct io_plan start_ok(struct io_conn *conn, struct data *d)
 
        memset(d->wbuf, 7, sizeof(d->wbuf));
        ok1(io_duplex(conn, write_out, finish_ok, d));
-       return io_read(conn, d->buf, sizeof(d->buf), io_close, d);
+       return io_read(d->buf, sizeof(d->buf), io_close, d);
+}
+
+static void init_conn(int fd, struct data *d)
+{
+       if (!io_new_conn(fd, start_ok, finish_ok, d))
+               abort();
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -79,7 +85,7 @@ int main(void)
        d->state = 0;
        fd = make_listen_fd("65012", &addrinfo);
        ok1(fd >= 0);
-       d->l = io_new_listener(fd, start_ok, finish_ok, d);
+       d->l = io_new_listener(fd, init_conn, d);
        ok1(d->l);
        fflush(stdout);
        if (!fork()) {