X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fio%2Ftest%2Frun-01-start-finish.c;h=eb12e9488aea2eaca1dc445fb1cff6c46bddbbfc;hb=1d415706a6e948fe6dcc3b5dab45812b297f77a1;hp=837a12698faf13f76e4904a6fa0a94c42648b6d3;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0;p=ccan

diff --git a/ccan/io/test/run-01-start-finish.c b/ccan/io/test/run-01-start-finish.c
index 837a1269..eb12e948 100644
--- a/ccan/io/test/run-01-start-finish.c
+++ b/ccan/io/test/run-01-start-finish.c
@@ -6,18 +6,32 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
-static struct io_plan *start_ok(struct io_conn *conn, int *state)
+#ifdef DEBUG_CONN
+#define PORT "64001"
+#else
+#define PORT "65001"
+#endif
+static int expected_fd;
+
+static void finish_ok(struct io_conn *conn, int *state)
 {
-	ok1(*state == 0);
+	ok1(*state == 1);
+	ok1(io_conn_fd(conn) == expected_fd);
 	(*state)++;
-	return io_close(conn, NULL);
+	io_break(state + 1);
 }
 
-static void finish_ok(struct io_conn *conn, int *state)
+static struct io_plan *init_conn(struct io_conn *conn, int *state)
 {
-	ok1(*state == 1);
+#ifdef DEBUG_CONN
+	io_set_debug(conn, true);
+#endif
+	ok1(*state == 0);
 	(*state)++;
-	io_break(state + 1, NULL);
+	expected_fd = io_conn_fd(conn);
+	io_set_finish(conn, finish_ok, state);
+
+	return io_close(conn);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -60,10 +74,10 @@ int main(void)
 	int fd;
 
 	/* This is how many tests you plan to run */
-	plan_tests(9);
-	fd = make_listen_fd("65001", &addrinfo);
+	plan_tests(10);
+	fd = make_listen_fd(PORT, &addrinfo);
 	ok1(fd >= 0);
-	l = io_new_listener(fd, start_ok, finish_ok, &state);
+	l = io_new_listener(NULL, fd, init_conn, &state);
 	ok1(l);
 	fflush(stdout);
 	if (!fork()) {
@@ -79,7 +93,7 @@ int main(void)
 		exit(0);
 	}
 	freeaddrinfo(addrinfo);
-	ok1(io_loop() == &state + 1);
+	ok1(io_loop(NULL, NULL) == &state + 1);
 	ok1(state == 2);
 	io_close_listener(l);
 	ok1(wait(&state));