ccan/io: generic init function for listening connections.

[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 b5e0dc3f060b983f75d1cbca24b1e0b56ac4dbef..0ff3fc8a54a85c207c3552a1fc73528b60069cc6 100644 (file)
--- a/ccan/io/test/run-15-timeout.c
+++ b/ccan/io/test/run-15-timeout.c
@@ -15,14 +15,14 @@ struct data {
 };
 
 
-static struct io_op *no_timeout(struct io_conn *conn, struct data *d)
+static struct io_plan no_timeout(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
        return io_close(conn, d);
 }
 
-static struct io_op *timeout(struct io_conn *conn, struct data *d)
+static struct io_plan timeout(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
@@ -30,19 +30,25 @@ static struct io_op *timeout(struct io_conn *conn, struct data *d)
        return io_close(conn, d);
 }
 
-static struct io_op *start_ok(struct io_conn *conn, struct data *d)
+static struct io_plan start_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 0);
        d->state++;
        io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
-       return io_read(d->buf, sizeof(d->buf), io_next(conn, no_timeout, d));
+       return io_read(d->buf, sizeof(d->buf), no_timeout, d);
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 2);
        d->state++;
-       io_break(d, NULL);
+       io_break(d, NULL, NULL);
+}
+
+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)
@@ -91,7 +97,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);