X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Fio%2Ftest%2Frun-07-break.c;h=6fcaea341b58f1123ab72a322d3260dd71f53ba2;hb=869dc1528e64604e9264c6f12e0f2cb79bf3d79e;hp=7e9824d5a8ef0185611043dffcd07b52da7484c6;hpb=7a8a585c32d1010426f587a6933f05de7a06dfd0;p=ccan diff --git a/ccan/io/test/run-07-break.c b/ccan/io/test/run-07-break.c index 7e9824d5..6fcaea34 100644 --- a/ccan/io/test/run-07-break.c +++ b/ccan/io/test/run-07-break.c @@ -6,29 +6,37 @@ #include #include +#ifndef PORT +#define PORT "65007" +#endif + struct data { int state; char buf[4]; }; -static struct io_plan *do_read(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_read(d->buf, sizeof(d->buf), io_next(conn, io_close, d)); + return io_close(conn, NULL); } -static struct io_plan *start_break(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 == 2); d->state++; - return io_break(d, io_next(conn, do_read, d)); } -static void finish_ok(struct io_conn *conn, struct data *d) +static void init_conn(int fd, struct data *d) { - ok1(d->state == 2); + ok1(d->state == 0); d->state++; + + io_set_finish(io_new_conn(fd, + io_break(d, + io_read(d->buf, sizeof(d->buf), read_done, d))), + finish_ok, d); } static int make_listen_fd(const char *port, struct addrinfo **info) @@ -73,9 +81,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, start_break, finish_ok, d); + l = io_new_listener(fd, init_conn, d); ok1(l); fflush(stdout); if (!fork()) {