diff options
| author | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-04-02 20:44:42 -0600 |
|---|---|---|
| committer | Luke T. Shumaker <lukeshu@lukeshu.com> | 2025-04-02 20:44:42 -0600 |
| commit | 13b8cafb7e28784f037ecd24876c225ddcf48d76 (patch) | |
| tree | 8226b5414ce6f013025372bd40753b88217970d1 /lib9p/srv.c | |
| parent | 7a71f8ca21aea7e554e66ddd08eaed073db9c400 (diff) | |
| parent | a99e18d00d2aebdb10b8e162525ecae5d107d493 (diff) | |
Merge branch 'lukeshu/9p-misc'
Diffstat (limited to 'lib9p/srv.c')
| -rw-r--r-- | lib9p/srv.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/lib9p/srv.c b/lib9p/srv.c index a29a4cb..2723207 100644 --- a/lib9p/srv.c +++ b/lib9p/srv.c @@ -6,12 +6,18 @@ #include <alloca.h> #include <inttypes.h> /* for PRI* */ +#include <stddef.h> /* for size_t */ +#include <limits.h> /* for SSIZE_MAX, not set by newlib */ +#ifndef SSIZE_MAX +#define SSIZE_MAX (SIZE_MAX >> 1) +#endif #include <libcr/coroutine.h> #include <libcr_ipc/chan.h> #include <libcr_ipc/mutex.h> #include <libcr_ipc/select.h> #include <libmisc/assert.h> +#include <libmisc/endian.h> #include <libhw/generic/net.h> #define LOG_NAME 9P_SRV @@ -20,7 +26,9 @@ #define IMPLEMENTATION_FOR_LIB9P_SRV_H YES #include <lib9p/srv.h> -#include "internal.h" +/* config *********************************************************************/ + +#include "config.h" #ifndef CONFIG_9P_SRV_MAX_FIDS #error config.h must define CONFIG_9P_SRV_MAX_FIDS @@ -32,6 +40,14 @@ /* 1=just the root dir, 2=just files in the root dir, 3=1 subdir, ... */ #error config.h must define CONFIG_9P_SRV_MAX_DEPTH #endif +#ifndef CONFIG_9P_SRV_MAX_MSG_SIZE + #error config.h must define CONFIG_9P_SRV_MAX_MSG_SIZE +#endif +#ifndef CONFIG_9P_SRV_MAX_HOSTMSG_SIZE + #error config.h must define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE +#endif +static_assert(CONFIG_9P_SRV_MAX_MSG_SIZE <= CONFIG_9P_SRV_MAX_HOSTMSG_SIZE); +static_assert(CONFIG_9P_SRV_MAX_HOSTMSG_SIZE <= SSIZE_MAX); /* context ********************************************************************/ @@ -218,7 +234,7 @@ static void handle_message(struct _lib9p_srv_req *ctx); srv->readers++; - uint32_t initial_rerror_overhead = _lib9p_table_msg_min_size[LIB9P_VER_unknown]; + uint32_t initial_rerror_overhead = lib9p_version_min_msg_size(LIB9P_VER_unknown); for (;;) { struct _srv_conn conn = { @@ -238,7 +254,7 @@ static void handle_message(struct _lib9p_srv_req *ctx); struct _srv_sess sess = { .parent_conn = &conn, .version = LIB9P_VER_unknown, - .max_msg_size = CONFIG_9P_MAX_MSG_SIZE, + .max_msg_size = CONFIG_9P_SRV_MAX_MSG_SIZE, .rerror_overhead = initial_rerror_overhead, .initialized = false, }; @@ -397,7 +413,7 @@ static tmessage_handler tmessage_handlers[0x100] = { static void handle_message(struct _lib9p_srv_req *ctx) { uint8_t *host_req = NULL; - uint8_t host_resp[CONFIG_9P_MAX_HOSTMSG_SIZE]; + uint8_t host_resp[CONFIG_9P_SRV_MAX_HOSTMSG_SIZE]; /* Unmarshal it. */ ssize_t host_size = lib9p_Tmsg_validate(&ctx->ctx.basectx, ctx->net_bytes); @@ -573,7 +589,7 @@ static void handle_Tversion(struct _lib9p_srv_req *ctx, #endif } - uint32_t min_msg_size = _lib9p_table_msg_min_size[version]; + uint32_t min_msg_size = lib9p_version_min_msg_size(version); if (req->max_msg_size < min_msg_size) { lib9p_errorf(&ctx->ctx.basectx, LINUX_EDOM, "requested max_msg_size is less than minimum for %s (%"PRIu32" < %"PRIu32")", @@ -582,8 +598,8 @@ static void handle_Tversion(struct _lib9p_srv_req *ctx, } resp->version = lib9p_str((char *)lib9p_version_str(version)); /* cast to discard "const" qualifier */ - resp->max_msg_size = (CONFIG_9P_MAX_MSG_SIZE < req->max_msg_size) - ? CONFIG_9P_MAX_MSG_SIZE + resp->max_msg_size = (CONFIG_9P_SRV_MAX_MSG_SIZE < req->max_msg_size) + ? CONFIG_9P_SRV_MAX_MSG_SIZE : req->max_msg_size; /* Close the old session. */ |