X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-05-write.c;h=41fe2949498b8f2d2166ad7810d54e29bfb351ae;hp=0e1c4a5e4bf64d1c1bc6afc6388ca757a95e5e1e;hb=318f717e34e4735e5397bee24dbbee69205be82b;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0

diff --git a/ccan/io/test/run-05-write.c b/ccan/io/test/run-05-write.c
index 0e1c4a5e..41fe2949 100644
--- a/ccan/io/test/run-05-write.c
+++ b/ccan/io/test/run-05-write.c
@@ -6,24 +6,34 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifdef DEBUG_CONN
+#define PORT "64005"
+#else
+#define PORT "65005"
+#endif
+
 struct data {
 	int state;
 	size_t bytes;
 	char *buf;
 };
 
-static struct io_plan *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);
 }
 
-static void finish_ok(struct io_conn *conn, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
-	ok1(d->state == 1);
+#ifdef DEBUG_CONN
+	io_set_debug(conn, true);
+#endif
+	ok1(d->state == 0);
 	d->state++;
-	io_break(d, NULL);
+	io_set_finish(conn, finish_ok, d);
+	return io_write(conn, d->buf, d->bytes, io_close_cb, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -92,9 +102,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(NULL, fd, init_conn, d);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {
@@ -105,7 +115,7 @@ int main(void)
 		free(d);
 		exit(0);
 	}
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 2);
 
 	ok1(wait(&status));