lib9p: Add another testclient

4 files changed, 191 insertions, 0 deletions

diff --git a/lib9p/CMakeLists.txt b/lib9p/CMakeLists.txt
index 8f22068..949b6d6 100644
--- a/lib9p/CMakeLists.txt
+++ b/lib9p/CMakeLists.txt
@@ -21,6 +21,14 @@ target_link_libraries(lib9p INTERFACE
 if (ENABLE_TESTS)
 	add_subdirectory(tests/test_server)
 
+	function(add_lib9p_executable arg_testname)
+		add_executable("${arg_testname}" "tests/${arg_testname}.c")
+		target_link_libraries("${arg_testname}" lib9p)
+		target_include_directories("${arg_testname}" PRIVATE
+			${CMAKE_CURRENT_SOURCE_DIR}/tests
+			${CMAKE_CURRENT_SOURCE_DIR}/tests/client_config
+		)
+	endfunction()
 	function(add_lib9p_test arg_testscript)
 		get_filename_component(tmp_basename "${arg_testscript}" "NAME")
 		add_test(
@@ -31,6 +39,9 @@ if (ENABLE_TESTS)
 
 	add_lib9p_test("${CMAKE_CURRENT_SOURCE_DIR}/tests/testclient-p9p")
 
+	add_lib9p_executable("testclient-sess")
+	add_lib9p_test("./testclient-sess")
+
 	add_lib_test(lib9p test_compile)
 	target_include_directories(test_compile PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_compile_config)
 endif()
diff --git a/lib9p/tests/client_config/config.h b/lib9p/tests/client_config/config.h
new file mode 100644
index 0000000..65ee9de
--- /dev/null
+++ b/lib9p/tests/client_config/config.h
@@ -0,0 +1,40 @@
+/* config.h - Compile-time configuration for lib9p test clients
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#ifndef _CONFIG_H_
+#define _CONFIG_H_
+
+/* 9P *************************************************************************/
+
+#define CONFIG_9P_MAX_ERR_SIZE          128
+#define CONFIG_9P_MAX_9P2000_e_WELEM    16
+
+#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_u       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_e       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_L       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_p9p     1 /* bool */
+
+/* 9P server (unused) *********************************************************/
+
+#define CONFIG_9P_SRV_MAX_MSG_SIZE      ((4*1024)+24)
+#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE  CONFIG_9P_SRV_MAX_MSG_SIZE+16
+#define CONFIG_9P_SRV_MAX_FIDS          16
+#define CONFIG_9P_SRV_MAX_REQS          2
+#define CONFIG_9P_SRV_MAX_DEPTH         3
+
+/* COROUTINE (unused) *********************************************************/
+
+#define CONFIG_COROUTINE_STACK_SIZE_DEFAULT    (32*1024)
+#define CONFIG_COROUTINE_NAME_LEN              16
+#define CONFIG_COROUTINE_MEASURE_STACK         1 /* bool */
+#define CONFIG_COROUTINE_PROTECT_STACK         1 /* bool */
+#define CONFIG_COROUTINE_DEBUG                 0 /* bool */
+#define CONFIG_COROUTINE_VALGRIND              1 /* bool */
+#define CONFIG_COROUTINE_GDB                   1 /* bool */
+#define CONFIG_COROUTINE_NUM                   2
+
+#endif /* _CONFIG_H_ */
diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c
new file mode 100644
index 0000000..d03327b
--- /dev/null
+++ b/lib9p/tests/testclient-sess.c
@@ -0,0 +1,112 @@
+/* lib9p/tests/testclient-sess.c - Test the 9P `test_server`'s sessions
+ *
+ * Copyright (C) 2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <arpa/inet.h> /* for htons(), inet_addr() */
+#include <errno.h>
+#include <error.h>
+#include <netinet/in.h> /* for struct sockaddr{,_in} */
+#include <stdlib.h> /* for atoi() */
+#include <sys/socket.h> /* for socket(), connect() */
+#include <sys/uio.h> /* for writev() */
+#include <unistd.h> /* for read() */
+
+#include <libmisc/assert.h>
+#include <libmisc/endian.h>
+#include <lib9p/9p.h>
+
+#define MAX_MSG_SIZE (8*1024)
+
+static void _send9p(int fd, struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body) {
+	struct lib9p_Tmsg_send_buf buf;
+	bool err = lib9p_Tmsg_marshal(ctx, typ, body, &buf);
+	assert(!err);
+	size_t exp = 0;
+	for (size_t i = 0; i < buf.iov_cnt; i++)
+		exp += buf.iov[i].iov_len;
+	ssize_t act = writev(fd, buf.iov, buf.iov_cnt);
+	if (act < 0)
+		error(1, errno, "writev");
+	assert((size_t)act == exp);
+}
+
+#define send9p(typ, ...) _send9p(fd, &ctx, LIB9P_TYP_##typ, &((struct lib9p_msg_##typ){ __VA_ARGS__ }))
+
+static void _recv9p(int fd) {
+	uint8_t buf[MAX_MSG_SIZE];
+	size_t goal = 4;
+	size_t done = 0;
+	while (done < goal) {
+		ssize_t n = read(fd, &buf[done], goal-done);
+		if (n < 0)
+			error(1, errno, "read");
+		done += n;
+	}
+	goal = uint32le_decode(buf);
+	assert(goal <= MAX_MSG_SIZE);
+	while (done < goal) {
+		ssize_t n = read(fd, &buf[done], goal-done);
+		if (n < 0)
+			error(1, errno, "read");
+		done += n;
+	}
+}
+
+#define recv9p() _recv9p(fd)
+
+int main(int argc, char *argv[]) {
+	if (argc != 2)
+		error(2, 0, "Usage: %s SERVER_PORT", argv[0]);
+	uint16_t server_port = atoi(argv[1]);
+
+	union {
+                struct sockaddr         gen;
+                struct sockaddr_in      in;
+	} server_addr = {};
+	server_addr.in.sin_family = AF_INET;
+	server_addr.in.sin_addr.s_addr = inet_addr("127.0.0.1");
+	server_addr.in.sin_port = htons(server_port);
+
+	int fd = socket(AF_INET, SOCK_STREAM, 0);
+	if (fd < 0)
+		error(1, errno, "socket");
+	if (connect(fd, &server_addr.gen, sizeof(server_addr)) < 0)
+		error(1, errno, "connect");
+
+	struct lib9p_ctx ctx = {
+		.max_msg_size = 16*1024,
+	};
+
+	struct lib9p_s wname[1];
+
+	/* numeric downgrade, unknown ext *************************************/
+	send9p(Tversion, .tag=0, .max_msg_size=57, .version=lib9p_str("9P2025.x"));
+	recv9p(); /* Rversion */
+	ctx.version = LIB9P_VER_9P2000;
+
+	/* numeric downgrade, known ext ***************************************/
+	send9p(Tversion, .tag=0, .max_msg_size=57, .version=lib9p_str("9P2025.u"));
+	recv9p(); /* Rversion */
+	ctx.version = LIB9P_VER_9P2000_u;
+
+	/* ext version ********************************************************/
+	send9p(Tversion, .tag=0, .max_msg_size=57, .version=lib9p_str("9P2000.u"));
+	recv9p(); /* Rversion */
+	ctx.version = LIB9P_VER_9P2000_u;
+
+	/* shutdown ***********************************************************/
+	send9p(Tversion, .tag=0, .max_msg_size=(8*1024), .version=lib9p_str("9P2000"));
+	recv9p(); /* Rversion */
+	ctx.version = LIB9P_VER_9P2000;
+	send9p(Tattach, .tag=0, .fid=0, .afid=LIB9P_FID_NOFID, .uname=lib9p_str("nobody"), .aname=lib9p_str(""));
+	recv9p(); /* Rattach */
+	wname[0] = lib9p_str("shutdown"); send9p(Twalk, .tag=0, .fid=0, .newfid=1, .nwname=1, .wname=wname);
+	recv9p(); /* Rwalk */
+	send9p(Topen, .tag=0, .fid=1, .mode=LIB9P_O_MODE_WRITE);
+	recv9p(); /* Ropen */
+	send9p(Twrite, .tag=0, .fid=1, .offset=0, .count=2, .data="1\n");
+	recv9p(); /* Rwrite */
+	return 0;
+}
diff --git a/lib9p/tests/testclient-sess.explog b/lib9p/tests/testclient-sess.explog
new file mode 100644
index 0000000..71f6244
--- /dev/null
+++ b/lib9p/tests/testclient-sess.explog
@@ -0,0 +1,28 @@
+# lib9p/tests/testclient-sess.explog - Expected 9P logfile of testclient-sess.c
+#
+# Copyright (C) 2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# numeric downgrade, unknown ext ###############################################
+> Tversion { tag=0 max_msg_size=57 version="9P2025.x" }
+< Rversion { tag=0 max_msg_size=57 version="9P2000" }
+
+# numeric downgrade, known ext #################################################
+> 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" }
+
+# shutdown #####################################################################
+> 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 }
+< Rattach { tag=0 qid={ type=(DIR) vers=1 path=5 } }
+> Twalk { tag=0 fid=0 newfid=1 nwname=1 wname=["shutdown" ] }
+< Rwalk { tag=0 nwqid=1 wqid=[{ type=(0) vers=1 path=4 } ] }
+> Topen { tag=0 fid=1 mode=(MODE_WRITE) }
+< Ropen { tag=0 qid={ type=(0) vers=1 path=4 } iounit=0 }
+> Twrite { tag=0 fid=1 offset=0 count=2 data="1\n" }
+< Rwrite { tag=0 count=2 }