base64: fix for unsigned chars (e.g. ARM).

[ccan] / ccan / io / test / run-12-bidir.c

diff --git a/ccan/io/test/run-12-bidir.c b/ccan/io/test/run-12-bidir.c
index 6dc94c8a4a57a1baee29d281b7e04355a7cd7752..77843ae7ba0bb2951d32c6d3e56b7d64d2916eed 100644 (file)
--- a/ccan/io/test/run-12-bidir.c
+++ b/ccan/io/test/run-12-bidir.c
@@ -6,6 +6,8 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#define PORT "65012"
+
 struct data {
        struct io_listener *l;
        int state;
@@ -18,27 +20,35 @@ static void finish_ok(struct io_conn *conn, struct data *d)
        d->state++;
 }
 
-static struct io_plan write_done(struct io_conn *conn, struct data *d)
+static struct io_plan *r_done(struct io_conn *conn, struct data *d)
 {
        d->state++;
-       return io_close(conn, NULL);
+       if (d->state == 3)
+               return io_close(conn);
+       return io_wait(conn, NULL, io_never, NULL);
 }
 
-static void init_conn(int fd, struct data *d)
+static struct io_plan *w_done(struct io_conn *conn, struct data *d)
 {
-       struct io_conn *conn;
+       d->state++;
+       if (d->state == 3)
+               return io_close(conn);
+       return io_out_wait(conn, NULL, io_never, NULL);
+}
 
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
+{
        ok1(d->state == 0);
        d->state++;
 
        io_close_listener(d->l);
 
        memset(d->wbuf, 7, sizeof(d->wbuf));
+       io_set_finish(conn, finish_ok, d);
 
-       conn = io_new_conn(fd, io_read(d->buf, sizeof(d->buf), io_close, d),
-                          finish_ok, d);
-       ok1(io_duplex(conn, io_write(d->wbuf, sizeof(d->wbuf), write_done, d),
-                     finish_ok, d));
+       return io_duplex(conn,
+                        io_read(conn, d->buf, sizeof(d->buf), r_done, d),
+                        io_write(conn, d->wbuf, sizeof(d->wbuf), w_done, d));
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -80,11 +90,11 @@ int main(void)
        int fd, status;
 
        /* This is how many tests you plan to run */
-       plan_tests(10);
+       plan_tests(9);
        d->state = 0;
-       fd = make_listen_fd("65012", &addrinfo);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       d->l = io_new_listener(fd, init_conn, d);
+       d->l = io_new_listener(NULL, fd, init_conn, d);
        ok1(d->l);
        fflush(stdout);
        if (!fork()) {
@@ -113,7 +123,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);