X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-02-read.c;h=74cb2f021d87393c1dd0110a10a110ad1d52f09a;hb=0ce52c7ca42c2b3a6458cac348f5a8b96d7f1b62;hp=3f376fe659a73d611b7b4c660b5dc7e49d6e68aa;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0;p=ccan

diff --git a/ccan/io/test/run-02-read.c b/ccan/io/test/run-02-read.c
index 3f376fe6..74cb2f02 100644
--- a/ccan/io/test/run-02-read.c
+++ b/ccan/io/test/run-02-read.c
@@ -6,23 +6,34 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifdef DEBUG_CONN
+#define PORT "64002"
+#else
+#define PORT "65002"
+#endif
+
 struct data {
 	int state;
 	char buf[4];
 };
 
-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_read(d->buf, sizeof(d->buf), 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_read(conn, d->buf, sizeof(d->buf), io_close_cb, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -60,16 +71,16 @@ static int make_listen_fd(const char *port, struct addrinfo **info)
 int main(void)
 {
 	struct data *d = malloc(sizeof(*d));
-	struct addrinfo *addrinfo;
+	struct addrinfo *addrinfo = NULL;
 	struct io_listener *l;
 	int fd, status;
 
 	/* This is how many tests you plan to run */
 	plan_tests(10);
 	d->state = 0;
-	fd = make_listen_fd("65002", &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()) {
@@ -93,7 +104,7 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 2);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);