diff --git a/src/app/main.c b/src/app/main.c index b645246..46d9da1 100644 --- a/src/app/main.c +++ b/src/app/main.c @@ -139,7 +139,7 @@ int main(int argc, char * argv[]) wsfs_server_start(server); struct wsfs_jsonrpc * const rpc = wsfs_server_get_jsonrpc_service(server); - result = wsfs_operations_loop(args.mount_point, rpc); + result = wsfs_operations_loop_ll(args.mount_point, rpc); wsfs_server_dispose(server); } else diff --git a/src/wsfs/operation/ll_close.c b/src/wsfs/operation/ll_close.c index e45ea8b..6d22302 100644 --- a/src/wsfs/operation/ll_close.c +++ b/src/wsfs/operation/ll_close.c @@ -1,14 +1,30 @@ #include "wsfs/operations.h" + +#include #include +#include + +#include "wsfs/jsonrpc.h" #include "wsfs/util.h" -#include void wsfs_operation_ll_close( fuse_req_t request, - fuse_ino_t WSFS_UNUSED_PARAM(inode), - struct fuse_file_info * WSFS_UNUSED_PARAM(file_info)) + fuse_ino_t inode, + struct fuse_file_info * file_info) { - puts("close"); - fuse_reply_err(request, ENOENT); + struct wsfs_operations_context * user_data = fuse_req_userdata(request); + struct wsfs_jsonrpc * rpc = user_data->rpc; + + json_t * result = NULL; + int handle = (int) (file_info->fh & INT_MAX); + wsfs_status const status = wsfs_jsonrpc_invoke(rpc, &result, "close", "iii", inode, handle, file_info->flags); + if (NULL != result) + { + // unused + json_decref(result); + } + + + fuse_reply_err(request, (WSFS_GOOD == status) ? 0 : ENOENT); } diff --git a/src/wsfs/operation/ll_open.c b/src/wsfs/operation/ll_open.c index f898b53..0a68c60 100644 --- a/src/wsfs/operation/ll_open.c +++ b/src/wsfs/operation/ll_open.c @@ -1,14 +1,42 @@ #include "wsfs/operations.h" + #include -#include "wsfs/util.h" +#include -#include +#include "wsfs/jsonrpc.h" +#include "wsfs/util.h" void wsfs_operation_ll_open( fuse_req_t request, - fuse_ino_t WSFS_UNUSED_PARAM(inode), - struct fuse_file_info * WSFS_UNUSED_PARAM(file_info)) + fuse_ino_t inode, + struct fuse_file_info * file_info) { - puts("open"); - fuse_reply_err(request, ENOENT); + struct wsfs_operations_context * user_data = fuse_req_userdata(request); + struct wsfs_jsonrpc * rpc = user_data->rpc; + + json_t * result = NULL; + wsfs_status status = wsfs_jsonrpc_invoke(rpc, &result, "open", "ii", inode, file_info->flags); + if (NULL != result) + { + json_t * handle_holder = json_object_get(result, "handle"); + if ((NULL != handle_holder) && (json_is_integer(handle_holder))) + { + file_info->fh = json_integer_value(handle_holder); + } + else + { + status = WSFS_BAD_FORMAT; + } + + json_decref(result); + } + + if (WSFS_GOOD == status) + { + fuse_reply_open(request, file_info); + } + else + { + fuse_reply_err(request, ENOENT); + } } diff --git a/src/wsfs/operation/ll_read.c b/src/wsfs/operation/ll_read.c index 8904599..0450f67 100644 --- a/src/wsfs/operation/ll_read.c +++ b/src/wsfs/operation/ll_read.c @@ -1,16 +1,87 @@ #include "wsfs/operations.h" + #include -#include "wsfs/util.h" +#include +#include +#include + +#include "wsfs/jsonrpc.h" + +#define WSFS_MAX_READ_LENGTH 4096 + +static wsfs_status wsfs_fill_buffer( + char * buffer, + size_t buffer_size, + char const * format, + char const * data, + size_t count) +{ + wsfs_status status = WSFS_GOOD; + + size_t const copy_count = (buffer_size < count) ? buffer_size : count; + if (0 < copy_count) + { + if (0 == strcmp("identity", format)) + { + memcpy(buffer, data, copy_count); + } + else + { + status = WSFS_BAD; + } + } -#include + return status; +} void wsfs_operation_ll_read( fuse_req_t request, - fuse_ino_t WSFS_UNUSED_PARAM(inode), - size_t WSFS_UNUSED_PARAM(size), - off_t WSFS_UNUSED_PARAM(offset), - struct fuse_file_info * WSFS_UNUSED_PARAM(file_info)) + fuse_ino_t inode, + size_t size, + off_t offset, + struct fuse_file_info * file_info) { - puts("read"); - fuse_reply_err(request, ENOENT); + struct wsfs_operations_context * user_data = fuse_req_userdata(request); + struct wsfs_jsonrpc * rpc = user_data->rpc; + + int const length = (size <= WSFS_MAX_READ_LENGTH) ? (int) size : WSFS_MAX_READ_LENGTH; + char * buffer = malloc(length); + size_t count = 0; + json_t * data = NULL; + int handle = (file_info->fh & INT_MAX); + wsfs_status status = wsfs_jsonrpc_invoke(rpc, &data, "read", "iiii", inode, handle, (int) offset, length); + if (NULL != data) + { + json_t * data_holder = json_object_get(data, "data"); + json_t * format_holder = json_object_get(data, "format"); + json_t * count_holder = json_object_get(data, "count"); + + if ((NULL != data_holder) && (json_is_string(data_holder)) && + (NULL != format_holder) && (json_is_string(format_holder)) && + (NULL != count_holder) && (json_is_integer(count_holder))) + { + char const * const data = json_string_value(data_holder); + char const * const format = json_string_value(format_holder); + count = (size_t) json_integer_value(count_holder); + + status = wsfs_fill_buffer(buffer, length, format, data, count); + } + else + { + status = WSFS_BAD_FORMAT; + } + + json_decref(data); + } + + if (WSFS_GOOD == status) + { + fuse_reply_buf(request, buffer, count); + } + else + { + fuse_reply_err(request, ENOENT); + } + + free(buffer); }