X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-07-break.c;h=d13b0f183609bc8cef34d1992eae0f068358c5be;hb=61f58ff94e35c9b8ac5488554e2554bc5c9888b3;hp=5a6e9701b52ca3d2c9567c096ebe02bd3c83458c;hpb=57d9d1be33905691ec756b14b066181ca6850ced;p=ccan

diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c
index 5a6e9701..d13b0f18 100644
--- a/ccan/io/test/run-07-break.c
+++ b/ccan/io/test/run-07-break.c
@@ -6,16 +6,22 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifdef DEBUG_CONN
+#define PORT "64007"
+#else
+#define PORT "65007"
+#endif
+
 struct data {
 	int state;
 	char buf[4];
 };
 
-static struct io_plan read_done(struct io_conn *conn, struct data *d)
+static struct io_plan *read_done(struct io_conn *conn, struct data *d)
 {
 	ok1(d->state == 1);
 	d->state++;
-	return io_close(conn, NULL);
+	return io_close(conn);
 }
 
 static void finish_ok(struct io_conn *conn, struct data *d)
@@ -24,16 +30,18 @@ static void finish_ok(struct io_conn *conn, struct data *d)
 	d->state++;
 }
 
-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++;
 
-	if (!io_new_conn(fd,
-			 io_break(d,
-				  io_read(d->buf, sizeof(d->buf), read_done, d)),
-			 finish_ok, d))
-		abort();
+	io_set_finish(conn, finish_ok, d);
+
+	io_break(d);
+	return io_read(conn, d->buf, sizeof(d->buf), read_done, d);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -78,9 +86,9 @@ int main(void)
 	/* This is how many tests you plan to run */
 	plan_tests(13);
 	d->state = 0;
-	fd = make_listen_fd("65007", &addrinfo);
+	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()) {
@@ -104,11 +112,11 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == d);
+	ok1(io_loop(NULL, NULL) == d);
 	ok1(d->state == 1);
 	io_close_listener(l);
 
-	ok1(io_loop() == NULL);
+	ok1(io_loop(NULL, NULL) == NULL);
 	ok1(d->state == 3);
 	ok1(memcmp(d->buf, "hellothere", sizeof(d->buf)) == 0);
 	free(d);