ccan/io: initialize connection with an explicit I/O plan.

[ccan] / ccan / io / test / run-15-timeout.c

diff --git a/ccan/io/test/run-15-timeout.c b/ccan/io/test/run-15-timeout.c
index 2f5c60ac7893d79af3787302287c032513e00419..f8ddc6a57ed6e21ae492a497476a1cd65c2a6bfa 100644 (file)
--- a/ccan/io/test/run-15-timeout.c
+++ b/ccan/io/test/run-15-timeout.c
@@ -30,19 +30,23 @@ static struct io_plan timeout(struct io_conn *conn, struct data *d)
        return io_close(conn, d);
 }
 
-static struct io_plan start_ok(struct io_conn *conn, struct data *d)
+static void finish_ok(struct io_conn *conn, struct data *d)
 {
-       ok1(d->state == 0);
+       ok1(d->state == 2);
        d->state++;
-       io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
-       return io_read(d->buf, sizeof(d->buf), no_timeout, d);
+       io_break(d, io_idle());
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
-       ok1(d->state == 2);
+       struct io_conn *conn;
+
+       ok1(d->state == 0);
        d->state++;
-       io_break(d, NULL, NULL);
+
+       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), no_timeout, d),
+                          finish_ok, d);
+       io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -91,7 +95,7 @@ int main(void)
        d->timeout_usec = 100000;
        fd = make_listen_fd("65002", &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, start_ok, finish_ok, d);
+       l = io_new_listener(fd, init_conn, d);
        ok1(l);
        fflush(stdout);