ccan/io: io_connect()

[ccan] / ccan / io / test / run-07-break.c

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index 5a6e9701b52ca3d2c9567c096ebe02bd3c83458c..19cc6a8e662b393f8f672e3a46d1340d37e2a634 100644 (file)
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65007"
+#endif
+
 struct data {
        int state;
        char buf[4];
@@ -15,7 +19,7 @@ static struct io_plan read_done(struct io_conn *conn, struct data *d)
 {
        ok1(d->state == 1);
        d->state++;
-       return io_close(conn, NULL);
+       return io_close();
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -29,11 +33,10 @@ static void init_conn(int fd, struct data *d)
        ok1(d->state == 0);
        d->state++;
 
-       if (!io_new_conn(fd,
-                        io_break(d,
-                                 io_read(d->buf, sizeof(d->buf), read_done, d)),
-                        finish_ok, d))
-               abort();
+       io_set_finish(io_new_conn(fd,
+                                 io_break(d,
+                                          io_read(d->buf, sizeof(d->buf), read_done, d))),
+                     finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -78,7 +81,7 @@ int main(void)
        /* This is how many tests you plan to run */
        plan_tests(13);
        d->state = 0;
-       fd = make_listen_fd("65007", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
        l = io_new_listener(fd, init_conn, d);
        ok1(l);