io: io_set_alloc()

[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 f8ddc6a57ed6e21ae492a497476a1cd65c2a6bfa..6f92ec3a634848c0770fcd21016e56acfb082274 100644 (file)
--- a/ccan/io/test/run-15-timeout.c
+++ b/ccan/io/test/run-15-timeout.c
@@ -7,6 +7,10 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#ifndef PORT
+#define PORT "65015"
+#endif
+
 struct data {
        int state;
        int timeout_usec;
@@ -19,7 +23,7 @@ static struct io_plan no_timeout(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       return io_close(conn, d);
+       return io_close();
 }
 
 static struct io_plan timeout(struct io_conn *conn, struct data *d)
@@ -27,7 +31,7 @@ static struct io_plan timeout(struct io_conn *conn, struct data *d)
        ok1(d->state == 1);
        d->state++;
        d->timed_out = true;
-       return io_close(conn, d);
+       return io_close();
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -44,8 +48,8 @@ static void init_conn(int fd, struct data *d)
        ok1(d->state == 0);
        d->state++;
 
-       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), no_timeout, d),
-                          finish_ok, d);
+       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), no_timeout, d));
+       io_set_finish(conn, finish_ok, d);
        io_timeout(conn, time_from_usec(d->timeout_usec), timeout, d);
 }
 
@@ -93,7 +97,7 @@ int main(void)
        d->state = 0;
        d->timed_out = false;
        d->timeout_usec = 100000;
-       fd = make_listen_fd("65002", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);