X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-12-bidir.c;h=77843ae7ba0bb2951d32c6d3e56b7d64d2916eed;hp=0329b81f6755e63f338de1f1890bb803d72b422e;hb=HEAD;hpb=e92e2f65a9ae729a0c9805427da737ad936abddb

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 0329b81f..77843ae7 100644
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -6,14 +6,11 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
 #define PORT "65012"
-#endif
 
 struct data {
 	struct io_listener *l;
 	int state;
-	int done;
 	char buf[4];
 	char wbuf[32];
 };
@@ -23,15 +20,22 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 	d->state++;
 }
 
-static struct io_plan *rw_done(struct io_conn *conn, struct data *d)
+static struct io_plan *r_done(struct io_conn *conn, struct data *d)
 {
 	d->state++;
-	d->done++;
-	if (d->done == 2)
+	if (d->state == 3)
 		return io_close(conn);
 	return io_wait(conn, NULL, io_never, NULL);
 }
 
+static struct io_plan *w_done(struct io_conn *conn, struct data *d)
+{
+	d->state++;
+	if (d->state == 3)
+		return io_close(conn);
+	return io_out_wait(conn, NULL, io_never, NULL);
+}
+
 static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 0);
@@ -42,8 +46,9 @@ static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 	memset(d->wbuf, 7, sizeof(d->wbuf));
 	io_set_finish(conn, finish_ok, d);
 
-	return io_duplex(io_read(conn, d->buf, sizeof(d->buf), rw_done, d),
-			 io_write(conn, d->wbuf, sizeof(d->wbuf), rw_done, d));
+	return io_duplex(conn,
+			 io_read(conn, d->buf, sizeof(d->buf), r_done, d),
+			 io_write(conn, d->wbuf, sizeof(d->wbuf), w_done, d));
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -85,9 +90,8 @@ int main(void)
 	int fd, status;
 
 	/* This is how many tests you plan to run */
-	plan_tests(10);
+	plan_tests(9);
 	d->state = 0;
-	d->done = 0;
 	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
 	d->l = io_new_listener(NULL, fd, init_conn, d);
@@ -119,9 +123,8 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == NULL);
+	ok1(io_loop(NULL, NULL) == NULL);
 	ok1(d->state == 4);
-	ok1(d->done == 2);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);