X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-05-write.c;h=41fe2949498b8f2d2166ad7810d54e29bfb351ae;hb=318f717e34e4735e5397bee24dbbee69205be82b;hp=5319def8f2cc28c6921b2b611a2c99b013b1402d;hpb=3a7b8a8a8081ebbb6457527de376dec6264bc381;p=ccan

diff --git a/ccan/io/test/run-05-write.c b/ccan/io/test/run-05-write.c
index 5319def8..41fe2949 100644
--- a/ccan/io/test/run-05-write.c
+++ b/ccan/io/test/run-05-write.c
@@ -6,7 +6,9 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
+#ifdef DEBUG_CONN
+#define PORT "64005"
+#else
 #define PORT "65005"
 #endif
 
@@ -20,16 +22,18 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	io_break(d, io_idle());
+	io_break(d);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
+#ifdef DEBUG_CONN
+	io_set_debug(conn, true);
+#endif
 	ok1(d->state == 0);
 	d->state++;
-	io_set_finish(io_new_conn(fd, io_write(d->buf, d->bytes,
-					       io_close_cb, d)),
-		      finish_ok, d);
+	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)
@@ -100,7 +104,7 @@ int main(void)
 	memset(d->buf, 'a', d->bytes);
 	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()) {
@@ -111,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));