X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-05-write.c;h=5319def8f2cc28c6921b2b611a2c99b013b1402d;hp=83c8c4cab0e3348618fd7a68468e05bb14201355;hb=13b38a7282c6043d6abe310e5a16d6610ed7a1c1;hpb=0a2fd289c7bf57d9fc35ad6af36df4bcc694f361

diff --git a/ccan/io/test/run-05-write.c b/ccan/io/test/run-05-write.c
index 83c8c4ca..5319def8 100644
--- a/ccan/io/test/run-05-write.c
+++ b/ccan/io/test/run-05-write.c
@@ -6,24 +6,30 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65005"
+#endif
+
 struct data {
 	int state;
 	size_t bytes;
 	char *buf;
 };
 
-static struct io_op *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 == 1);
 	d->state++;
-	return io_write(d->buf, d->bytes, io_next(conn, io_close, 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 == 1);
+	ok1(d->state == 0);
 	d->state++;
-	io_break(d, NULL);
+	io_set_finish(io_new_conn(fd, io_write(d->buf, d->bytes,
+					       io_close_cb, d)),
+		      finish_ok, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -92,9 +98,9 @@ int main(void)
 	d->bytes = 1024*1024;
 	d->buf = malloc(d->bytes);
 	memset(d->buf, 'a', d->bytes);
-	fd = make_listen_fd("65005", &addrinfo);
+	fd = make_listen_fd(PORT, &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);
 	if (!fork()) {