summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/srv9p/CMakeLists.txt37
-rw-r--r--cmd/srv9p/main.c49
-rw-r--r--cmd/srv9p/static.c144
-rwxr-xr-xcmd/srv9p/static.h.gen6
-rw-r--r--cmd/srv9p/static/Documentation/x1
-rw-r--r--cmd/srv9p/static/README.md1
-rw-r--r--cmd/srv9p/static9p.c232
-rw-r--r--cmd/srv9p/static9p.h (renamed from cmd/srv9p/static.h)26
8 files changed, 331 insertions, 165 deletions
diff --git a/cmd/srv9p/CMakeLists.txt b/cmd/srv9p/CMakeLists.txt
index 8aadb28..e9d4097 100644
--- a/cmd/srv9p/CMakeLists.txt
+++ b/cmd/srv9p/CMakeLists.txt
@@ -3,10 +3,16 @@
# Copyright (C) 2024 Luke T. Shumaker <lukeshu@lukeshu.com>
# SPDX-Licence-Identifier: AGPL-3.0-or-later
+set(static_srcs
+ static/README.md
+ static/Documentation/x
+)
+
add_executable(srv9p
main.c
- static.c
+ static9p.c
)
+target_include_directories(srv9p PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(srv9p PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
target_link_libraries(srv9p
libcr
@@ -14,3 +20,32 @@ target_link_libraries(srv9p
libnetio
lib9p
)
+
+set(static_objs)
+foreach(static_src ${static_srcs})
+ add_custom_command(
+ OUTPUT "${static_src}.obj"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ COMMAND dirname -- ${CMAKE_CURRENT_BINARY_DIR}/${static_src}.obj | xargs mkdir -p --
+ COMMAND ${CMAKE_LINKER} -r -b binary -o ${CMAKE_CURRENT_BINARY_DIR}/${static_src}.obj ${static_src}
+ DEPENDS "${static_src}"
+ )
+ list(APPEND static_objs "${static_src}.obj")
+endforeach()
+
+set_source_files_properties(${static_objs} PROPERTIES
+ EXTERNAL_OBJECT true
+ GENERATED true
+)
+
+set_source_files_properties(static.h PROPERTIES
+ GENERATED true
+)
+
+add_custom_command(
+ OUTPUT static.h
+ DEPENDS ${static_objs} static.h.gen
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/static.h.gen ${static_objs} >static.h
+)
+
+target_sources(srv9p PRIVATE ${static_objs} static.h)
diff --git a/cmd/srv9p/main.c b/cmd/srv9p/main.c
index 4aaae28..8609f36 100644
--- a/cmd/srv9p/main.c
+++ b/cmd/srv9p/main.c
@@ -5,6 +5,7 @@
#include <libnetio/netio.h>
#include <lib9p/srv.h>
+#include "static9p.h"
#include "static.h"
/* configuration **************************************************************/
@@ -19,26 +20,48 @@
#define UNUSED(name) /* name __attribute__((unused)) */
-static struct static_dir root = {
- .header = { .vtable = &static_dir_vtable },
+static struct static_file readme = {
+ .metadata = {
+ .header = { .vtable = &static_file_vtable },
+
+ .u_name = "root", .u_num = 0, /* owner user */
+ .g_name = "root", .g_num = 0, /* owner group */
+ .m_name = "root", .m_num = 0, /* last-modified-by user */
- .u_name = "root", .u_num = 0, /* owner user */
- .g_name = "root", .g_num = 0, /* owner group */
- .m_name = "root", .m_num = 0, /* last-modified-by user */
+ .pathnum = __COUNTER__,
+ .name = "README.md",
+ .perm = 0444,
+ .atime = 1728337905,
+ .mtime = 1728337904,
+ },
- .pathnum = __COUNTER__,
- .name = "",
- .perm = 0555,
- .atime = 1728337905,
- .mtime = 1728337904,
+ .data_start = _binary_static_README_md_start,
+ .data_end = _binary_static_README_md_end,
+};
+
+static struct static_dir root = {
+ .metadata = {
+ .header = { .vtable = &static_dir_vtable },
+
+ .u_name = "root", .u_num = 0, /* owner user */
+ .g_name = "root", .g_num = 0, /* owner group */
+ .m_name = "root", .m_num = 0, /* last-modified-by user */
+
+ .pathnum = __COUNTER__,
+ .name = "",
+ .perm = 0555,
+ .atime = 1728337905,
+ .mtime = 1728337904,
+ },
.members = {
+ &readme.metadata.header,
NULL,
},
};
-struct lib9p_srv_file *fs_root(struct lib9p_srv_ctx *UNUSED(ctx), char *UNUSED(treename)) {
- return &root.header;
+static struct lib9p_srv_file *get_root(struct lib9p_srv_ctx *UNUSED(ctx), char *UNUSED(treename)) {
+ return &root.metadata.header;
}
int main() {
@@ -48,7 +71,7 @@ int main() {
struct lib9p_srv srv = {
.sockfd = sock,
- .rootdir = fs_root,
+ .rootdir = get_root,
};
for (int i = 0; i < CONFIG_NETIO_NUM_CONNS; i++)
diff --git a/cmd/srv9p/static.c b/cmd/srv9p/static.c
deleted file mode 100644
index a6da53f..0000000
--- a/cmd/srv9p/static.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <assert.h>
-
-#include "static.h"
-
-#define UNUSED(name) /* name __attribute__((unused)) */
-#define p9_str(cstr) ((struct lib9p_s){ .len = strlen(cstr), .utf8 = cstr })
-#define p9_nulstr ((struct lib9p_s){ .len = 0, .utf8 = NULL })
-
-/******************************************************************************/
-
-static struct lib9p_srv_file *static_dir_clone(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- return &file->header;
-}
-
-static void static_dir_free(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- /* do nothing */
-}
-
-static uint32_t static_dir_io(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file, lib9p_o_t UNUSED(flags)) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- return 1;
-}
-
-static struct lib9p_stat static_dir_stat(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- return (struct lib9p_stat){
- .kern_type = 0,
- .kern_dev = 0,
- .file_qid = {
- .type = LIB9P_QT_DIR,
- .vers = 1,
- .path = file->pathnum,
- },
- .file_mode = LIB9P_DM_DIR | (file->perm & 0555),
- .file_atime = file->atime,
- .file_mtime = file->mtime,
- .file_size = 0,
- .file_name = p9_str(file->name),
- .file_owner_uid = p9_str(file->u_name),
- .file_owner_gid = p9_str(file->g_name),
- .file_last_modified_uid = p9_str(file->m_name),
- .file_extension = p9_nulstr,
- .file_owner_n_uid = file->u_num,
- .file_owner_n_gid = file->g_num,
- .file_last_modified_n_uid = file->m_num,
- };
-}
-
-static void static_dir_wstat(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file,
- struct lib9p_stat UNUSED(new)) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
-}
-
-static void static_dir_remove(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
- assert(ctx);
- struct static_dir *file = (struct static_dir *)_file;
- assert(file);
-
- lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
-}
-
-
-static struct lib9p_srv_file *static_dir_dopen(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
- char *UNUSED(childname)) {
- assert(ctx);
- struct static_dir *dir = (struct static_dir *)_dir;
- assert(dir);
-
- lib9p_error(&ctx->basectx, LINUX_EFAULT, "TODO: dopen");
- return NULL;
-}
-
-static struct lib9p_srv_file *static_dir_dcreate(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
- char *UNUSED(childname),
- lib9p_dm_t UNUSED(perm), lib9p_o_t UNUSED(flags)) {
- assert(ctx);
- struct static_dir *dir = (struct static_dir *)_dir;
- assert(dir);
-
- lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
- return NULL;
-}
-
-static size_t static_dir_dread(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
- uint8_t *buf,
- uint32_t byte_count,
- size_t _obj_offset) {
- assert(ctx);
- struct static_dir *dir = (struct static_dir *)_dir;
- assert(dir);
-
- uint32_t byte_offset = 0;
- size_t obj_offset = _obj_offset;
- while (dir->members[obj_offset]) {
- struct lib9p_srv_file *filep = dir->members[obj_offset];
- struct lib9p_stat stat = filep->vtable->stat(ctx, filep);
- if (lib9p_ctx_has_error(&ctx->basectx))
- break;
- uint32_t nbytes = lib9p_marshal_stat(&ctx->basectx, byte_count-byte_offset, &stat,
- &buf[byte_offset]);
- if (!nbytes) {
- if (obj_offset == _obj_offset)
- lib9p_error(&ctx->basectx,
- LINUX_ERANGE, "stat object does not fit into negotiated max message size");
- break;
- }
- byte_offset += nbytes;
- obj_offset++;
- }
- return obj_offset - _obj_offset;
-}
-
-struct lib9p_srv_file_vtable static_dir_vtable = {
- .clone = static_dir_clone,
- .free = static_dir_free,
-
- .io = static_dir_io,
- .stat = static_dir_stat,
- .wstat = static_dir_wstat,
- .remove = static_dir_remove,
-
- .dopen = static_dir_dopen,
- .dcreate = static_dir_dcreate,
-
- .dread = static_dir_dread,
-};
diff --git a/cmd/srv9p/static.h.gen b/cmd/srv9p/static.h.gen
new file mode 100755
index 0000000..1c4d7b1
--- /dev/null
+++ b/cmd/srv9p/static.h.gen
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+nm --format=posix "$@" |
+ sed -n -E \
+ -e 's/(.*_(end|start)) D .*/extern char \1[];/p' \
+ -e 's/(.*_size) A .*/extern size_t \1;/p'
diff --git a/cmd/srv9p/static/Documentation/x b/cmd/srv9p/static/Documentation/x
new file mode 100644
index 0000000..257cc56
--- /dev/null
+++ b/cmd/srv9p/static/Documentation/x
@@ -0,0 +1 @@
+foo
diff --git a/cmd/srv9p/static/README.md b/cmd/srv9p/static/README.md
new file mode 100644
index 0000000..af5626b
--- /dev/null
+++ b/cmd/srv9p/static/README.md
@@ -0,0 +1 @@
+Hello, world!
diff --git a/cmd/srv9p/static9p.c b/cmd/srv9p/static9p.c
new file mode 100644
index 0000000..e20921d
--- /dev/null
+++ b/cmd/srv9p/static9p.c
@@ -0,0 +1,232 @@
+#include <assert.h>
+
+#include "static9p.h"
+
+#define UNUSED(name) /* name __attribute__((unused)) */
+#define p9_str(cstr) ((struct lib9p_s){ .len = strlen(cstr), .utf8 = cstr })
+#define p9_nulstr ((struct lib9p_s){ .len = 0, .utf8 = NULL })
+
+/* common metadata ************************************************************/
+
+static struct lib9p_srv_file *static_metadata_clone(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
+ assert(ctx);
+ struct static_metadata *file = (struct static_metadata *)_file;
+ assert(file);
+
+ return &file->header;
+}
+
+static void static_metadata_free(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
+ assert(ctx);
+ struct static_metadata *file = (struct static_metadata *)_file;
+ assert(file);
+
+ /* do nothing */
+}
+
+static uint32_t static_metadata_io(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file, lib9p_o_t UNUSED(flags)) {
+ assert(ctx);
+ struct static_metadata *file = (struct static_metadata *)_file;
+ assert(file);
+
+ return 0;
+}
+
+static void static_metadata_wstat(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file,
+ struct lib9p_stat UNUSED(new)) {
+ assert(ctx);
+ struct static_metadata *file = (struct static_metadata *)_file;
+ assert(file);
+
+ lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+}
+
+static void static_metadata_remove(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
+ assert(ctx);
+ struct static_metadata *file = (struct static_metadata *)_file;
+ assert(file);
+
+ lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+}
+
+/* dir ************************************************************************/
+
+static struct lib9p_stat static_dir_stat(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
+ assert(ctx);
+ struct static_dir *file = (struct static_dir *)_file;
+ assert(file);
+
+ return (struct lib9p_stat){
+ .kern_type = 0,
+ .kern_dev = 0,
+ .file_qid = {
+ .type = LIB9P_QT_DIR,
+ .vers = 1,
+ .path = file->metadata.pathnum,
+ },
+ .file_mode = LIB9P_DM_DIR | (file->metadata.perm & 0555),
+ .file_atime = file->metadata.atime,
+ .file_mtime = file->metadata.mtime,
+ .file_size = 0,
+ .file_name = p9_str(file->metadata.name),
+ .file_owner_uid = p9_str(file->metadata.u_name),
+ .file_owner_gid = p9_str(file->metadata.g_name),
+ .file_last_modified_uid = p9_str(file->metadata.m_name),
+ .file_extension = p9_nulstr,
+ .file_owner_n_uid = file->metadata.u_num,
+ .file_owner_n_gid = file->metadata.g_num,
+ .file_last_modified_n_uid = file->metadata.m_num,
+ };
+}
+
+static struct lib9p_srv_file *static_dir_dopen(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
+ char *childname) {
+ assert(ctx);
+ struct static_dir *dir = (struct static_dir *)_dir;
+ assert(dir);
+
+ for (size_t i = 0; dir->members[i]; i++) {
+ struct lib9p_srv_file *filep = dir->members[i];
+ struct lib9p_stat stat = filep->vtable->stat(ctx, filep);
+ if (lib9p_ctx_has_error(&ctx->basectx))
+ break;
+ lib9p_assert_stat(stat);
+ if (strcmp(stat.file_name.utf8, childname) == 0)
+ return filep;
+ }
+ lib9p_error(&ctx->basectx,
+ LINUX_ENOENT, "no such file or directory");
+ return NULL;
+}
+
+static struct lib9p_srv_file *static_dir_dcreate(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
+ char *UNUSED(childname),
+ lib9p_dm_t UNUSED(perm), lib9p_o_t UNUSED(flags)) {
+ assert(ctx);
+ struct static_dir *dir = (struct static_dir *)_dir;
+ assert(dir);
+
+ lib9p_error(&ctx->basectx, LINUX_EROFS, "read-only part of filesystem");
+ return NULL;
+}
+
+static size_t static_dir_dread(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_dir,
+ uint8_t *buf,
+ uint32_t byte_count,
+ size_t _obj_offset) {
+ assert(ctx);
+ struct static_dir *dir = (struct static_dir *)_dir;
+ assert(dir);
+
+ uint32_t byte_offset = 0;
+ size_t obj_offset = _obj_offset;
+ while (dir->members[obj_offset]) {
+ struct lib9p_srv_file *filep = dir->members[obj_offset];
+ struct lib9p_stat stat = filep->vtable->stat(ctx, filep);
+ if (lib9p_ctx_has_error(&ctx->basectx))
+ break;
+ lib9p_assert_stat(stat);
+ uint32_t nbytes = lib9p_marshal_stat(&ctx->basectx, byte_count-byte_offset, &stat,
+ &buf[byte_offset]);
+ if (!nbytes) {
+ if (obj_offset == _obj_offset)
+ lib9p_error(&ctx->basectx,
+ LINUX_ERANGE, "stat object does not fit into negotiated max message size");
+ break;
+ }
+ byte_offset += nbytes;
+ obj_offset++;
+ }
+ return obj_offset - _obj_offset;
+}
+
+struct lib9p_srv_file_vtable static_dir_vtable = {
+ .clone = static_metadata_clone,
+ .free = static_metadata_free,
+
+ .io = static_metadata_io,
+ .stat = static_dir_stat,
+ .wstat = static_metadata_wstat,
+ .remove = static_metadata_remove,
+
+ .dopen = static_dir_dopen,
+ .dcreate = static_dir_dcreate,
+
+ .dread = static_dir_dread,
+};
+
+/* file ***********************************************************************/
+
+static inline size_t static_file_size(struct static_file *file) {
+ assert(file);
+
+ assert(file->data_start);
+ if (!file->data_end)
+ return file->data_size;
+ return (size_t)((uintptr_t)file->data_end - (uintptr_t)file->data_start);
+}
+
+static struct lib9p_stat static_file_stat(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file) {
+ assert(ctx);
+ struct static_file *file = (struct static_file *)_file;
+ assert(file);
+
+ return (struct lib9p_stat){
+ .kern_type = 0,
+ .kern_dev = 0,
+ .file_qid = {
+ .type = LIB9P_QT_FILE,
+ .vers = 1,
+ .path = file->metadata.pathnum,
+ },
+ .file_mode = file->metadata.perm & 0444,
+ .file_atime = file->metadata.atime,
+ .file_mtime = file->metadata.mtime,
+ .file_size = (uint64_t)static_file_size(file),
+ .file_name = p9_str(file->metadata.name),
+ .file_owner_uid = p9_str(file->metadata.u_name),
+ .file_owner_gid = p9_str(file->metadata.g_name),
+ .file_last_modified_uid = p9_str(file->metadata.m_name),
+ .file_extension = p9_nulstr,
+ .file_owner_n_uid = file->metadata.u_num,
+ .file_owner_n_gid = file->metadata.g_num,
+ .file_last_modified_n_uid = file->metadata.m_num,
+ };
+}
+
+static uint32_t static_file_pread(struct lib9p_srv_ctx *ctx, struct lib9p_srv_file *_file,
+ void *buf,
+ uint32_t byte_count,
+ uint64_t byte_offset) {
+ assert(ctx);
+ struct static_file *file = (struct static_file *)_file;
+ assert(file);
+
+ size_t data_size = static_file_size(file);
+
+ if (byte_offset > (uint64_t)data_size) {
+ lib9p_error(&ctx->basectx,
+ LINUX_EINVAL, "offset is past end-of-file length");
+ return 0;
+ }
+
+ 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;
+ memcpy(buf, &file->data_start[beg_off], end_off-beg_off);
+ return (uint32_t)(end_off-beg_off);
+}
+
+struct lib9p_srv_file_vtable static_file_vtable = {
+ .clone = static_metadata_clone,
+ .free = static_metadata_free,
+
+ .io = static_metadata_io,
+ .stat = static_file_stat,
+ .wstat = static_metadata_wstat,
+ .remove = static_metadata_remove,
+
+ .pread = static_file_pread,
+ .pwrite = NULL,
+};
diff --git a/cmd/srv9p/static.h b/cmd/srv9p/static9p.h
index afb5a3f..2d77138 100644
--- a/cmd/srv9p/static.h
+++ b/cmd/srv9p/static9p.h
@@ -1,11 +1,9 @@
-#ifndef _STATIC_H_
-#define _STATIC_H_
+#ifndef _STATIC9P_H_
+#define _STATIC9P_H_
#include <lib9p/srv.h>
-extern struct lib9p_srv_file_vtable static_dir_vtable;
-
-struct static_dir {
+struct static_metadata {
struct lib9p_srv_file header;
char *u_name;
@@ -19,11 +17,25 @@ struct static_dir {
char *name;
lib9p_dm_t perm;
uint32_t atime, mtime;
+};
+
+struct static_dir {
+ struct static_metadata metadata;
/* NULL-terminated */
struct lib9p_srv_file *members[];
};
-//extern struct lib9p_srv_io_dir_vtable static_dir_io_vtable;
-#endif /* _STATIC_H_ */
+struct static_file {
+ struct static_metadata metadata;
+
+ char *data_start; /* must not be NULL */
+ char *data_end; /* may be NULL, in which case data_size is used */
+ size_t data_size; /* only used if .data_end==NULL */
+};
+
+extern struct lib9p_srv_file_vtable static_dir_vtable;
+extern struct lib9p_srv_file_vtable static_file_vtable;
+
+#endif /* _STATIC9P_H_ */
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-25 06:09:31 +0000