X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-12-bidir.c;h=812c863c85059be1c0fd8dfce286b063034b63f1;hp=3e769beb19920f0b3ae61cfdf1880d56f9a2bba1;hb=e2ce04eac30ec613c858bd4cd2ca12e1c464edb8;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 3e769beb..812c863c 100644
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -6,6 +6,10 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifndef PORT
+#define PORT "65012"
+#endif
+
 struct data {
 	struct io_listener *l;
 	int state;
@@ -18,22 +22,27 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 	d->state++;
 }
 
-static struct io_plan *write_out(struct io_conn *conn, struct data *d)
+static struct io_plan write_done(struct io_conn *conn, struct data *d)
 {
 	d->state++;
-	return io_write(d->wbuf, sizeof(d->wbuf), io_next(conn, io_close, d));
+	return io_close(conn, NULL);
 }
 
-static struct io_plan *start_ok(struct io_conn *conn, struct data *d)
+static void init_conn(int fd, struct data *d)
 {
+	struct io_conn *conn;
+
 	ok1(d->state == 0);
 	d->state++;
 
 	io_close_listener(d->l);
 
 	memset(d->wbuf, 7, sizeof(d->wbuf));
-	ok1(io_duplex(conn, write_out, finish_ok, d));
-	return io_read(d->buf, sizeof(d->buf), io_next(conn, io_close, d));
+
+	conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
+			   finish_ok, d);
+	ok1(io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d),
+		      finish_ok, d));
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -77,9 +86,9 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(10);
 	d->state = 0;
-	fd = make_listen_fd("65012", &addrinfo);
+	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
-	d->l = io_new_listener(fd, start_ok, finish_ok, d);
+	d->l = io_new_listener(fd, init_conn, d);
 	ok1(d->l);
 	fflush(stdout);
 	if (!fork()) {