X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-16-duplex-test.c;h=007f41119614e2016a2d3aef21f7ba9d9465febb;hb=bc6d22ecf820d0b4547ace17ff7e7ecebf0e415b;hp=9d939c58aa422dc09be1a4057fc0d0e9cb4ad0d9;hpb=e92e2f65a9ae729a0c9805427da737ad936abddb;p=ccan

diff --git a/ccan/io/test/run-16-duplex-test.c b/ccan/io/test/run-16-duplex-test.c
index 9d939c58..007f4111 100644
--- a/ccan/io/test/run-16-duplex-test.c
+++ b/ccan/io/test/run-16-duplex-test.c
@@ -8,9 +8,7 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-#ifndef PORT
 #define PORT "65016"
-#endif
 
 struct data {
 	struct io_listener *l;
@@ -27,9 +25,7 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 static struct io_plan *io_done(struct io_conn *conn, struct data *d)
 {
 	d->state++;
-	if (d->state == 3)
-		return io_close(conn);
-	return io_wait(conn, d, io_close_cb, NULL);
+	return io_halfclose(conn);
 }
 
 static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
@@ -43,7 +39,8 @@ static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
 
 	io_close_listener(d->l);
 
-	return io_duplex(io_read(conn, d->buf, sizeof(d->buf), io_done, d),
+	return io_duplex(conn,
+			 io_read(conn, d->buf, sizeof(d->buf), io_done, d),
 			 io_write(conn, d->wbuf, sizeof(d->wbuf), io_done, d));
 }
 
@@ -119,7 +116,7 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == NULL);
+	ok1(io_loop(NULL, NULL) == NULL);
 	ok1(d->state == 4);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);