X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fio%2Ftest%2Frun-07-break.c;h=135dcbb8ffc3374a7b82cc1e3b00d442503662f3;hb=96dcdfbf1a400f7cb43cf3f0761f52fd6de9ff65;hp=19cc6a8e662b393f8f672e3a46d1340d37e2a634;hpb=3a7b8a8a8081ebbb6457527de376dec6264bc381;p=ccan

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index 19cc6a8e..135dcbb8 100644
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,20 +6,18 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
 #define PORT "65007"
-#endif
 
 struct data {
 	int state;
 	char buf[4];
 };
 
-static struct io_plan read_done(struct io_conn *conn, struct data *d)
+static struct io_plan *read_done(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	return io_close();
+	return io_close(conn);
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -28,15 +26,15 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 	d->state++;
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 0);
 	d->state++;
 
-	io_set_finish(io_new_conn(fd,
-				  io_break(d,
-					   io_read(d->buf, sizeof(d->buf), read_done, d))),
-		      finish_ok, d);
+	io_set_finish(conn, finish_ok, d);
+
+	io_break(d);
+	return io_read(conn, d->buf, sizeof(d->buf), read_done, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -83,7 +81,7 @@ int main(void)
 	d->state = 0;
 	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
-	l = io_new_listener(fd, init_conn, d);
+	l = io_new_listener(NULL, fd, init_conn, d);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {
@@ -107,11 +105,11 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 1);
 	io_close_listener(l);
 
-	ok1(io_loop() == NULL);
+	ok1(io_loop(NULL, NULL) == NULL);
 	ok1(d->state == 3);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);