wip

1 files changed, 7 insertions, 7 deletions

diff --git a/lib9p/srv.c b/lib9p/srv.c
index cc4a048..8eef372 100644
--- a/lib9p/srv.c
+++ b/lib9p/srv.c
@@ -56,11 +56,11 @@ struct _srv_fidinfo {
 
 struct _srv_conn {
 	/* immutable */
-	struct lib9p_srv        *parent_srv;
-	implements_net_conn     *fd;
-	cid_t                    reader; /* the lib9p_srv_read_cr() coroutine */
+	struct lib9p_srv                *parent_srv;
+	implements_net_stream_conn	*fd;
+	cid_t                            reader; /* the lib9p_srv_read_cr() coroutine */
 	/* mutable */
-	cr_mutex_t               writelock;
+	cr_mutex_t                       writelock;
 };
 
 struct _srv_sess {
@@ -139,7 +139,7 @@ static void respond_error(struct _lib9p_srv_req *req) {
 	struct _srv_sess *sess = req->parent_sess;
 
 	/* Truncate the error-string if necessary to avoid needing to
-	 * return ERANGE.  The assert() in
+	 * return LINUX_ERANGE.  The assert() in
 	 * rerror_overhead_for_version() has checked that this
 	 * addition doesn't overflow.  */
 	if (((uint32_t)host.ename.len) + sess->rerror_overhead > sess->max_msg_size)
@@ -158,7 +158,7 @@ static void respond_error(struct _lib9p_srv_req *req) {
 
 /* read coroutine *************************************************************/
 
-static bool read_at_least(implements_net_conn *fd, uint8_t *buf, size_t goal, size_t *done) {
+static bool read_at_least(implements_net_stream_conn *fd, uint8_t *buf, size_t goal, size_t *done) {
 	assert(buf);
 	assert(goal);
 	assert(done);
@@ -179,7 +179,7 @@ static bool read_at_least(implements_net_conn *fd, uint8_t *buf, size_t goal, si
 
 static void handle_message(struct _lib9p_srv_req *ctx);
 
-__attribute__ ((noreturn)) void lib9p_srv_read_cr(struct lib9p_srv *srv, implements_net_listener *listener) {
+__attribute__ ((noreturn)) void lib9p_srv_read_cr(struct lib9p_srv *srv, implements_net_stream_listener *listener) {
 	uint8_t buf[CONFIG_9P_MAX_MSG_SIZE];
 
 	assert(srv);