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)
d->state++;
}
-static void init_conn(int fd, struct data *d)
+static struct io_plan *init_conn(struct io_conn *conn, struct data *d)
{
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)
d->state = 0;
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()) {