Merge branch 'lukeshu/9p-malloc'

10 files changed, 300 insertions, 50 deletions

diff --git a/lib9p/tests/test_server/CMakeLists.txt b/lib9p/tests/test_server/CMakeLists.txt
index eb16165..681e583 100644
--- a/lib9p/tests/test_server/CMakeLists.txt
+++ b/lib9p/tests/test_server/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(test_server_objs OBJECT
 	main.c
 	fs_shutdown.c
 	fs_slowread.c
+	fs_whoami.c
 )
 target_include_directories(test_server_objs PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
 target_include_directories(test_server_objs PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/lib9p/tests/test_server/fs_shutdown.c b/lib9p/tests/test_server/fs_shutdown.c
index 3f88985..26a8a10 100644
--- a/lib9p/tests/test_server/fs_shutdown.c
+++ b/lib9p/tests/test_server/fs_shutdown.c
@@ -4,12 +4,17 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <stdlib.h>
+
 #include "fs_shutdown.h"
 
 LO_IMPLEMENTATION_C(lib9p_srv_file, struct shutdown_file, shutdown_file, static);
 
-LO_IMPLEMENTATION_H(lib9p_srv_fio, struct shutdown_file, shutdown_file);
-LO_IMPLEMENTATION_C(lib9p_srv_fio, struct shutdown_file, shutdown_file, static);
+struct shutdown_fio {
+	struct shutdown_file *parent;
+};
+LO_IMPLEMENTATION_H(lib9p_srv_fio, struct shutdown_fio, shutdown_fio);
+LO_IMPLEMENTATION_C(lib9p_srv_fio, struct shutdown_fio, shutdown_fio, static);
 
 /* srv_file *******************************************************************/
 
@@ -62,32 +67,42 @@ LIB9P_SRV_NOTDIR(struct shutdown_file, shutdown_file)
 static lo_interface lib9p_srv_fio shutdown_file_fopen(struct shutdown_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
 	assert(self);
 	assert(ctx);
-	return lo_box_shutdown_file_as_lib9p_srv_fio(self);
+
+	struct shutdown_fio *ret = malloc(sizeof(struct shutdown_fio));
+	ret->parent = self;
+
+	return lo_box_shutdown_fio_as_lib9p_srv_fio(ret);
 }
 
 /* srv_fio ********************************************************************/
 
-static void shutdown_file_iofree(struct shutdown_file *self) {
+static void shutdown_fio_iofree(struct shutdown_fio *self) {
+	assert(self);
+	free(self);
+}
+
+static struct lib9p_qid shutdown_fio_qid(struct shutdown_fio *self) {
 	assert(self);
+	return shutdown_file_qid(self->parent);
 }
 
-static uint32_t shutdown_file_iounit(struct shutdown_file *self) {
+static uint32_t shutdown_fio_iounit(struct shutdown_fio *self) {
 	assert(self);
 	return 0;
 }
 
-static uint32_t shutdown_file_pwrite(struct shutdown_file *self, struct lib9p_srv_ctx *ctx, void *buf, uint32_t byte_count, uint64_t LM_UNUSED(offset)) {
+static uint32_t shutdown_fio_pwrite(struct shutdown_fio *self, struct lib9p_srv_ctx *ctx, void *buf, uint32_t byte_count, uint64_t LM_UNUSED(offset)) {
 	assert(self);
 	assert(ctx);
 	assert(buf);
 	if (byte_count == 0)
 		return 0;
-	for (size_t i = 0; i < self->nlisteners; i++)
-		LO_CALL(lo_box_hostnet_tcplist_as_net_stream_listener(&self->listeners[i]), close);
+	for (size_t i = 0; i < self->parent->nlisteners; i++)
+		LO_CALL(lo_box_hostnet_tcplist_as_net_stream_listener(&self->parent->listeners[i]), close);
 	return byte_count;
 }
-static void shutdown_file_pread(struct shutdown_file *LM_UNUSED(self), struct lib9p_srv_ctx *LM_UNUSED(ctx),
-                                uint32_t LM_UNUSED(byte_count), uint64_t LM_UNUSED(byte_offset),
-                                struct iovec *LM_UNUSED(ret)) {
+static void shutdown_fio_pread(struct shutdown_fio *LM_UNUSED(self), struct lib9p_srv_ctx *LM_UNUSED(ctx),
+                               uint32_t LM_UNUSED(byte_count), uint64_t LM_UNUSED(byte_offset),
+                               struct iovec *LM_UNUSED(ret)) {
 	assert_notreached("not readable");
 }
diff --git a/lib9p/tests/test_server/fs_slowread.c b/lib9p/tests/test_server/fs_slowread.c
index 520edd2..c5db896 100644
--- a/lib9p/tests/test_server/fs_slowread.c
+++ b/lib9p/tests/test_server/fs_slowread.c
@@ -4,12 +4,17 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+#include <stdlib.h>
+
 #include "fs_slowread.h"
 
 LO_IMPLEMENTATION_C(lib9p_srv_file, struct slowread_file, slowread_file, static);
 
-LO_IMPLEMENTATION_H(lib9p_srv_fio, struct slowread_file, slowread_file);
-LO_IMPLEMENTATION_C(lib9p_srv_fio, struct slowread_file, slowread_file, static);
+struct slowread_fio {
+	struct slowread_file *parent;
+};
+LO_IMPLEMENTATION_H(lib9p_srv_fio, struct slowread_fio, slowread_fio);
+LO_IMPLEMENTATION_C(lib9p_srv_fio, struct slowread_fio, slowread_fio, static);
 
 /* srv_file *******************************************************************/
 
@@ -62,36 +67,46 @@ LIB9P_SRV_NOTDIR(struct slowread_file, slowread_file)
 static lo_interface lib9p_srv_fio slowread_file_fopen(struct slowread_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
 	assert(self);
 	assert(ctx);
-	return lo_box_slowread_file_as_lib9p_srv_fio(self);
+
+	struct slowread_fio *ret = malloc(sizeof(struct slowread_fio));
+	ret->parent = self;
+
+	return lo_box_slowread_fio_as_lib9p_srv_fio(ret);
 }
 
 /* srv_fio ********************************************************************/
 
-static void slowread_file_iofree(struct slowread_file *self) {
+static void slowread_fio_iofree(struct slowread_fio *self) {
+	assert(self);
+	free(self);
+}
+
+static struct lib9p_qid slowread_fio_qid(struct slowread_fio *self) {
 	assert(self);
+	return slowread_file_qid(self->parent);
 }
 
-static uint32_t slowread_file_iounit(struct slowread_file *self) {
+static uint32_t slowread_fio_iounit(struct slowread_fio *self) {
 	assert(self);
 	return 0;
 }
 
-static uint32_t slowread_file_pwrite(struct slowread_file *LM_UNUSED(self),
-                                     struct lib9p_srv_ctx *LM_UNUSED(ctx),
-                                     void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
-                                     uint64_t LM_UNUSED(offset)) {
+static uint32_t slowread_fio_pwrite(struct slowread_fio *LM_UNUSED(self),
+                                    struct lib9p_srv_ctx *LM_UNUSED(ctx),
+                                    void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
+                                    uint64_t LM_UNUSED(offset)) {
 	assert_notreached("not writable");
 }
-static void slowread_file_pread(struct slowread_file *self, struct lib9p_srv_ctx *ctx,
-                                uint32_t byte_count, uint64_t LM_UNUSED(byte_offset),
-                                struct iovec *ret) {
+static void slowread_fio_pread(struct slowread_fio *self, struct lib9p_srv_ctx *ctx,
+                               uint32_t byte_count, uint64_t LM_UNUSED(byte_offset),
+                               struct iovec *ret) {
 	assert(self);
 	assert(ctx);
 	assert(ret);
 
 	while (!lib9p_srv_flush_requested(ctx))
 		cr_yield();
-	if (self->flushable)
+	if (self->parent->flushable)
 		lib9p_srv_acknowledge_flush(ctx);
 	else
 		*ret = (struct iovec){
diff --git a/lib9p/tests/test_server/fs_whoami.c b/lib9p/tests/test_server/fs_whoami.c
new file mode 100644
index 0000000..ff6dd25
--- /dev/null
+++ b/lib9p/tests/test_server/fs_whoami.c
@@ -0,0 +1,156 @@
+/* lib9p/tests/test_server/fs_whoami.c - /whoami API endpoint
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <stdio.h> /* for snprintf() */
+#include <stdlib.h> /* for malloc(), realloc(), free() */
+
+#include "fs_whoami.h"
+
+LO_IMPLEMENTATION_C(lib9p_srv_file, struct whoami_file, whoami_file, static);
+
+struct whoami_fio {
+	struct whoami_file      *parent;
+	size_t                   buf_len;
+	char                    *buf;
+};
+LO_IMPLEMENTATION_H(lib9p_srv_fio, struct whoami_fio, whoami_fio);
+LO_IMPLEMENTATION_C(lib9p_srv_fio, struct whoami_fio, whoami_fio, static);
+
+size_t whoami_len(struct lib9p_srv_ctx *ctx) {
+	assert(ctx);
+	assert(ctx->authinfo);
+
+	size_t len = 0;
+	uint32_t uid = ctx->authinfo->uid;
+	while (uid) {
+		len++;
+		uid /= 10;
+	}
+	if (!len)
+		len++;
+	len += 2;
+	len += ctx->authinfo->uname.len;
+	return len;
+}
+
+/* srv_file *******************************************************************/
+
+static void whoami_file_free(struct whoami_file *self) {
+	assert(self);
+}
+static struct lib9p_qid whoami_file_qid(struct whoami_file *self) {
+	assert(self);
+	return (struct lib9p_qid){
+		.type = LIB9P_QT_FILE,
+		.vers = 1,
+		.path = self->pathnum,
+	};
+}
+
+static struct lib9p_stat whoami_file_stat(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
+	assert(self);
+	assert(ctx);
+
+	return (struct lib9p_stat){
+		.kern_type                = 0,
+		.kern_dev                 = 0,
+		.file_qid                 = whoami_file_qid(self),
+		.file_mode                = 0444,
+		.file_atime               = UTIL9P_ATIME,
+		.file_mtime               = UTIL9P_MTIME,
+		.file_size                = whoami_len(ctx),
+		.file_name                = lib9p_str(self->name),
+		.file_owner_uid           = lib9p_str("root"),
+		.file_owner_gid           = lib9p_str("root"),
+		.file_last_modified_uid   = lib9p_str("root"),
+		.file_extension           = lib9p_str(NULL),
+		.file_owner_n_uid         = 0,
+		.file_owner_n_gid         = 0,
+		.file_last_modified_n_uid = 0,
+	};
+}
+static void whoami_file_wstat(struct whoami_file *self, struct lib9p_srv_ctx *ctx, struct lib9p_stat) {
+	assert(self);
+	assert(ctx);
+	lib9p_error(&ctx->basectx, LINUX_EROFS, "cannot wstat API file");
+}
+static void whoami_file_remove(struct whoami_file *self, struct lib9p_srv_ctx *ctx) {
+	assert(self);
+	assert(ctx);
+	lib9p_error(&ctx->basectx, LINUX_EROFS, "cannot remove API file");
+}
+
+LIB9P_SRV_NOTDIR(struct whoami_file, whoami_file)
+
+static lo_interface lib9p_srv_fio whoami_file_fopen(struct whoami_file *self, struct lib9p_srv_ctx *ctx, bool, bool, bool) {
+	assert(self);
+	assert(ctx);
+
+	struct whoami_fio *ret = malloc(sizeof(struct whoami_fio));
+	ret->parent = self;
+	ret->buf_len = 0;
+	ret->buf = NULL;
+
+	return lo_box_whoami_fio_as_lib9p_srv_fio(ret);
+}
+
+/* srv_fio ********************************************************************/
+
+static void whoami_fio_iofree(struct whoami_fio *self) {
+	assert(self);
+	if (self->buf)
+		free(self->buf);
+	free(self);
+}
+
+static struct lib9p_qid whoami_fio_qid(struct whoami_fio *self) {
+	assert(self);
+	assert(self->parent);
+	return whoami_file_qid(self->parent);
+}
+
+static uint32_t whoami_fio_iounit(struct whoami_fio *self) {
+	assert(self);
+	return 0;
+}
+
+static uint32_t whoami_fio_pwrite(struct whoami_fio *LM_UNUSED(self),
+                                     struct lib9p_srv_ctx *LM_UNUSED(ctx),
+                                     void *LM_UNUSED(buf), uint32_t LM_UNUSED(byte_count),
+                                     uint64_t LM_UNUSED(offset)) {
+	assert_notreached("not writable");
+}
+static void whoami_fio_pread(struct whoami_fio *self, struct lib9p_srv_ctx *ctx,
+                             uint32_t byte_count, uint64_t byte_offset,
+                             struct iovec *ret) {
+	assert(self);
+	assert(ctx);
+	assert(ret);
+
+	size_t data_size = whoami_len(ctx);
+	if (self->buf_len < data_size+1) {
+		self->buf = realloc(self->buf, data_size+1);
+		self->buf_len = data_size+1;
+	}
+	snprintf(self->buf, self->buf_len, "%"PRIu32" %.*s\n",
+	         ctx->authinfo->uid, ctx->authinfo->uname.len, ctx->authinfo->uname.utf8);
+
+	if (byte_offset > (uint64_t)data_size) {
+		lib9p_error(&ctx->basectx,
+		            LINUX_EINVAL, "offset is past end-of-file length");
+		return;
+	}
+
+	size_t beg_off = (size_t)byte_offset;
+	size_t end_off = beg_off + (size_t)byte_count;
+	if (end_off > data_size)
+		end_off = data_size;
+
+	*ret = (struct iovec){
+		.iov_base = &self->buf[beg_off],
+		.iov_len = end_off-beg_off,
+	};
+}
diff --git a/lib9p/tests/test_server/fs_whoami.h b/lib9p/tests/test_server/fs_whoami.h
new file mode 100644
index 0000000..0d3d311
--- /dev/null
+++ b/lib9p/tests/test_server/fs_whoami.h
@@ -0,0 +1,20 @@
+/* lib9p/tests/test_server/fs_whoami.h - /whoami API endpoint
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#ifndef _LIB9P_TESTS_TEST_SERVER_FS_WHOAMI_H_
+#define _LIB9P_TESTS_TEST_SERVER_FS_WHOAMI_H_
+
+#include <util9p/static.h>
+#include <libhw/host_net.h>
+
+struct whoami_file {
+	char            *name;
+	uint64_t         pathnum;
+};
+LO_IMPLEMENTATION_H(lib9p_srv_file, struct whoami_file, whoami_file);
+#define lo_box_whoami_file_as_lib9p_srv_file(obj) util9p_box(whoami_file, obj)
+
+#endif /* _LIB9P_TESTS_TEST_SERVER_FS_WHOAMI_H_ */
diff --git a/lib9p/tests/test_server/main.c b/lib9p/tests/test_server/main.c
index 2743629..e89a75e 100644
--- a/lib9p/tests/test_server/main.c
+++ b/lib9p/tests/test_server/main.c
@@ -21,6 +21,7 @@
 #include "static.h"
 #include "fs_shutdown.h"
 #include "fs_slowread.h"
+#include "fs_whoami.h"
 
 /* configuration **************************************************************/
 
@@ -76,6 +77,7 @@ struct lib9p_srv_file root =
 		                    .flushable = false),
 		           API_FILE(7, "slowread-flushable", slowread,
 		                    .flushable = true),
+		           API_FILE(8, "whoami", whoami),
 		           );
 
 static lo_interface lib9p_srv_file get_root(struct lib9p_srv_ctx *LM_UNUSED(ctx), struct lib9p_s LM_UNUSED(treename)) {
@@ -90,7 +92,15 @@ static COROUTINE read_cr(void *_i) {
 
 	hostnet_tcp_listener_init(&globals.listeners[i], globals.port);
 
-	lib9p_srv_read_cr(&globals.srv, lo_box_hostnet_tcplist_as_net_stream_listener(&globals.listeners[i]));
+	lib9p_srv_accept_and_read_loop(&globals.srv, lo_box_hostnet_tcplist_as_net_stream_listener(&globals.listeners[i]));
+
+	cr_end();
+}
+
+static COROUTINE write_cr(void *) {
+	cr_begin();
+
+	lib9p_srv_worker_loop(&globals.srv);
 
 	cr_end();
 }
@@ -107,8 +117,8 @@ static COROUTINE init_cr(void *) {
 	}
 	for (int i = 0; i < 2*CONFIG_SRV9P_NUM_CONNS; i++) {
 		char name[] = {'w', 'r', 'i', 't', 'e', '-', hexdig[i], '\0'};
-		if (!coroutine_add(name, lib9p_srv_write_cr, &globals.srv))
-			error(1, 0, "coroutine_add(lib9p_srv_write_cr, &globals.srv)");
+		if (!coroutine_add(name, write_cr, NULL))
+			error(1, 0, "coroutine_add(write_cr, NULL)");
 	}
 
 	cr_exit();
diff --git a/lib9p/tests/testclient-p9p b/lib9p/tests/testclient-p9p
index 81a7e50..9c9fb5e 100755
--- a/lib9p/tests/testclient-p9p
+++ b/lib9p/tests/testclient-p9p
@@ -19,7 +19,7 @@ expect_lines() (
 )
 
 set -x
-client=(9p -a "localhost:${1}")
+client=(unshare --user 9p -a "localhost:${1}")
 
 out=$("${client[@]}" ls -l '')
 expect_lines \
@@ -27,7 +27,8 @@ expect_lines \
 	'--r--r--r-- M 0 root root 166 Oct  7  2024 README.md' \
 	'---w--w--w- M 0 root root   0 Oct  7  2024 shutdown' \
 	'--r--r--r-- M 0 root root   6 Oct  7  2024 slowread' \
-	'--r--r--r-- M 0 root root   6 Oct  7  2024 slowread-flushable'
+	'--r--r--r-- M 0 root root   6 Oct  7  2024 slowread-flushable' \
+	'--r--r--r-- M 0 root root   9 Oct  7  2024 whoami'
 
 out=$("${client[@]}" ls -l 'Documentation/')
 expect_lines \
diff --git a/lib9p/tests/testclient-p9p.explog b/lib9p/tests/testclient-p9p.explog
index 3bfb0b0..45651a4 100644
--- a/lib9p/tests/testclient-p9p.explog
+++ b/lib9p/tests/testclient-p9p.explog
@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=0 wname=[ ] }
 < Rwalk { tag=0 nwqid=0 wqid=[ ] }
@@ -19,16 +19,16 @@
 > Topen { tag=0 fid=1 mode=(MODE_READ) }
 < Ropen { tag=0 qid={ type=(DIR) vers=1 path=1 } iounit=0 }
 > Tread { tag=0 fid=1 offset=0 count=4096 }
-< Rread { tag=0 count=361 data=<bytedata> }
-> Tread { tag=0 fid=1 offset=361 count=4096 }
+< Rread { tag=0 count=428 data=<bytedata> }
+> Tread { tag=0 fid=1 offset=428 count=4096 }
 < Rread { tag=0 count=0 data="" }
 > Tclunk { tag=0 fid=1 }
 < Rclunk { tag=0 }
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=1 wname=["Documentation" ] }
 < Rwalk { tag=0 nwqid=1 wqid=[{ type=(DIR) vers=1 path=2 } ] }
@@ -48,9 +48,9 @@
 < Rclunk { tag=0 }
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=1 wname=["README.md" ] }
 < Rwalk { tag=0 nwqid=1 wqid=[{ type=(0) vers=1 path=4 } ] }
@@ -64,9 +64,9 @@
 < Rclunk { tag=0 }
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=2 wname=["Documentation", "x" ] }
 < Rwalk { tag=0 nwqid=2 wqid=[{ type=(DIR) vers=1 path=2 }, { type=(0) vers=1 path=3 } ] }
@@ -80,9 +80,9 @@
 < Rclunk { tag=0 }
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=2 wname=["Documentation", "x" ] }
 < Rwalk { tag=0 nwqid=2 wqid=[{ type=(DIR) vers=1 path=2 }, { type=(0) vers=1 path=3 } ] }
@@ -92,9 +92,9 @@
 < Rclunk { tag=0 }
 > Tversion { tag=NOTAG max_msg_size=8192 version="9P2000" }
 < Rversion { tag=NOTAG max_msg_size=4120 version="9P2000" }
-> Tauth { tag=0 afid=0 uname="lukeshu" aname="" n_uid=0 }
+> Tauth { tag=0 afid=0 uname="nobody" aname="" n_uid=0 }
 < Rerror { tag=0 errstr="authentication not required" errnum=95 }
-> Tattach { tag=0 fid=0 afid=NOFID uname="lukeshu" aname="" n_uid=0 }
+> Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }
 < Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
 > Twalk { tag=0 fid=0 newfid=1 nwname=1 wname=["shutdown" ] }
 < Rwalk { tag=0 nwqid=1 wqid=[{ type=(0) vers=1 path=5 } ] }
diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c
index 423dc2c..437c489 100644
--- a/lib9p/tests/testclient-sess.c
+++ b/lib9p/tests/testclient-sess.c
@@ -91,12 +91,28 @@ int main(int argc, char *argv[]) {
 	recv9p(); /* Rversion */
 	ctx.version = LIB9P_VER_9P2000_u;
 
-	/* ext version ********************************************************/
-	send9p(Tversion, .tag=0, .max_msg_size=57, .version=lib9p_str("9P2000.u"));
+	/* ext version, users *************************************************/
+	send9p(Tversion, .tag=0, .max_msg_size=(8*1024), .version=lib9p_str("9P2000.u"));
 	recv9p(); /* Rversion */
 	ctx.version = LIB9P_VER_9P2000_u;
+	send9p(Tattach, .tag=0, .fid=0, .afid=LIB9P_FID_NOFID, .uname=lib9p_str("alice"), .n_uid=1000, .aname=lib9p_str(""));
+	recv9p(); /* Rattach */
+	send9p(Tattach, .tag=0, .fid=1, .afid=LIB9P_FID_NOFID, .uname=lib9p_str("bob"), .n_uid=1001, .aname=lib9p_str(""));
+	recv9p(); /* Rattach */
+	wname[0] = lib9p_str("whoami"); send9p(Twalk, .tag=0, .fid=0, .newfid=2, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	wname[0] = lib9p_str("whoami"); send9p(Twalk, .tag=0, .fid=1, .newfid=3, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	send9p(Topen, .tag=0, .fid=2, .mode=LIB9P_O_MODE_READ);
+	recv9p(); /* Ropen */
+	send9p(Topen, .tag=0, .fid=3, .mode=LIB9P_O_MODE_READ);
+	recv9p(); /* Ropen */
+	send9p(Tread, .tag=0, .fid=2, .offset=0, .count=100);
+	recv9p(); /* Rread */
+	send9p(Tread, .tag=0, .fid=3, .offset=0, .count=100);
+	recv9p(); /* Rread */
 
-	/* main session *******************************************************/
+	/* flush **************************************************************/
 	send9p(Tversion, .tag=0, .max_msg_size=(8*1024), .version=lib9p_str("9P2000"));
 	recv9p(); /* Rversion */
 	ctx.version = LIB9P_VER_9P2000;
diff --git a/lib9p/tests/testclient-sess.explog b/lib9p/tests/testclient-sess.explog
index b1f3085..6aab242 100644
--- a/lib9p/tests/testclient-sess.explog
+++ b/lib9p/tests/testclient-sess.explog
@@ -11,11 +11,27 @@
 > Tversion { tag=0 max_msg_size=57 version="9P2025.u" }
 < Rversion { tag=0 max_msg_size=57 version="9P2000.u" }
 
-# ext version ##################################################################
-> Tversion { tag=0 max_msg_size=57 version="9P2000.u" }
-< Rversion { tag=0 max_msg_size=57 version="9P2000.u" }
+# ext version, users ###########################################################
+> Tversion { tag=0 max_msg_size=8192 version="9P2000.u" }
+< Rversion { tag=0 max_msg_size=4120 version="9P2000.u" }
+> Tattach { tag=0 fid=0 afid=NOFID uname="alice" aname="" n_uid=1000 }
+< Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
+> Tattach { tag=0 fid=1 afid=NOFID uname="bob" aname="" n_uid=1001 }
+< Rattach { tag=0 qid={ type=(DIR) vers=1 path=1 } }
+> Twalk { tag=0 fid=0 newfid=2 nwname=1 wname=["whoami" ] }
+< Rwalk { tag=0 nwqid=1 wqid=[{ type=(0) vers=1 path=8 } ] }
+> Twalk { tag=0 fid=1 newfid=3 nwname=1 wname=["whoami" ] }
+< Rwalk { tag=0 nwqid=1 wqid=[{ type=(0) vers=1 path=8 } ] }
+> Topen { tag=0 fid=2 mode=(MODE_READ) }
+< Ropen { tag=0 qid={ type=(0) vers=1 path=8 } iounit=0 }
+> Topen { tag=0 fid=3 mode=(MODE_READ) }
+< Ropen { tag=0 qid={ type=(0) vers=1 path=8 } iounit=0 }
+> Tread { tag=0 fid=2 offset=0 count=100 }
+< Rread { tag=0 count=11 data="1000 alice\n" }
+> Tread { tag=0 fid=3 offset=0 count=100 }
+< Rread { tag=0 count=9 data="1001 bob\n" }
 
-# main session #################################################################
+# flush ########################################################################
 > Tversion { tag=0 max_msg_size=8192 version="9P2000" }
 < Rversion { tag=0 max_msg_size=4120 version="9P2000" }
 > Tattach { tag=0 fid=0 afid=NOFID uname="nobody" aname="" n_uid=0 }