d->state++;
}
-static struct io_op *write_out(struct io_conn *conn, struct data *d)
+static struct io_plan write_out(struct io_conn *conn, struct data *d)
{
d->state++;
- return io_write(d->wbuf, sizeof(d->wbuf), io_next(conn, io_close, d));
+ return io_write(d->wbuf, sizeof(d->wbuf), io_close, d);
}
-static struct io_op *start_ok(struct io_conn *conn, struct data *d)
+static struct io_plan start_ok(struct io_conn *conn, struct data *d)
{
ok1(d->state == 0);
d->state++;
memset(d->wbuf, 7, sizeof(d->wbuf));
ok1(io_duplex(conn, write_out, finish_ok, d));
- return io_read(d->buf, sizeof(d->buf), io_next(conn, io_close, d));
+ return io_read(d->buf, sizeof(d->buf), io_close, d);
+}
+
+static void init_conn(int fd, struct data *d)
+{
+ if (!io_new_conn(fd, start_ok, finish_ok, d))
+ abort();
}
static int make_listen_fd(const char *port, struct addrinfo **info)
d->state = 0;
fd = make_listen_fd("65012", &addrinfo);
ok1(fd >= 0);
- d->l = io_new_listener(fd, start_ok, finish_ok, d);
+ d->l = io_new_listener(fd, init_conn, d);
ok1(d->l);
fflush(stdout);
if (!fork()) {