Home
My Posts

Archive
Login
Signup

Recent Posts

Free subdomains

Want your own xyz.kpaste.net sub-domain for your community? Just type the address into your browser address bar (foo.xyz.kpaste.net is also supported).

Suggestions/Bugs?

Email us at . Try to include as much info as possible.

About

Pastebin is a tool for collaborative debugging or editing.

 

msnfs41client: Patches for tests, cleanup+misc, 2024-11-16
Posted by Anonymous on Sat 16th Nov 2024 15:48
raw | new post

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting: None Bash C C++ CSS Diff HTML mIRC Script Perl PHP Python Smarty XML ---------------------------- ABAP Actionscript ADA Apache Log AppleScript APT sources.list ASM ASP AutoIT Bash C C# C++ C++ (with QT) CSS Diff HTML INI (Config Files) Java Javascript Lua Make mIRC Script MySQL NSIS Perl PHP Python Q(uick)BASIC robots Ruby Ruby on Rails SDLBasic Smarty SQL TCL Text VB.NET Visual BASIC Visual Fox Pro Visual Prolog Windows Registry Files XML Xorg.conf

To highlight particular lines, prefix each line with {%HIGHLIGHT}
From 9ea2021bf9c88d29e6d81ff2eec6e92a36f32222 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 16 Nov 2024 14:03:38 +0100 Subject: [PATCH 1/5] tests: Update tests for Windows native tar Update tests for Windows native tar to cover more problem areas. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- tests/wintartests/wintartest_seq001.bash | 110 +++++++++++++++++------ 1 file changed, 84 insertions(+), 26 deletions(-) diff --git a/tests/wintartests/wintartest_seq001.bash b/tests/wintartests/wintartest_seq001.bash index 489d169..ee9652b 100644 --- a/tests/wintartests/wintartest_seq001.bash +++ b/tests/wintartests/wintartest_seq001.bash @@ -11,41 +11,99 @@ # Written by Roland Mainz <roland.mainz@nrubsig.org> # -export PATH='/bin:/usr/bin' +function test_wintar_seq +{ + set -o xtrace + set -o errexit + set -o nounset -typeset -i i -typeset out + # config + typeset use_bzip2=$1 + typeset use_localdiskfortar=$2 -set -o xtrace -set -o errexit + # local vars + typeset tarfile_dir + typeset tarfilename + typeset -i i + typeset out + typeset -a testfiles + typeset currf -# Set umask=0000 to avoid permission trouble with SMB filesystems -umask 0000 + # seq 1040 == 4093 bytes + # seq 1042 == 4103 bytes + for i in 1 100 1040 5000 10000 12000 ; do + rm -f -- "${i}seq.txt" + seq "$i" >"${i}seq.txt" + testfiles+=( "${i}seq.txt" ) + done -rm -f '10000seq.txt' -seq 100000 >'10000seq.txt' ; tar -cvf - '10000seq.txt' >'10000seq.tar' #| pbzip2 -1 >'10000seq.tar.bz2' + if "${use_localdiskfortar}" ; then + tarfile_dir='/tmp' + else + tarfile_dir="$PWD" + fi -rm -Rf 'tmp' -mkdir 'tmp' -cd 'tmp' + if ${use_bzip2} ; then + tarfilename="${tarfile_dir}/test_seq.tar.bz2" + tar -cvf - "${testfiles[@]}" | pbzip2 -1 >"${tarfilename}" + else + tarfilename="${tarfile_dir}/test_seq.tar" + tar -cvf - "${testfiles[@]}" >"${tarfilename}" + fi -set +o xtrace + rm -Rf 'tmp' + mkdir 'tmp' + cd 'tmp' -for (( i=0 ; i < 2000 ; i++ )) ; do - printf '# Cycle %d:\n' "$i" - /cygdrive/c/Windows/system32/tar -xvf "$(cygpath -w '../10000seq.tar')" - out="$(od -x -v '10000seq.txt' | grep -F ' 0000' | head -n 5)" + set +o xtrace - if [[ "$out" != '' ]] ; then - printf '# ERROR: Sequence of zero bytes in plain /usr/bin/seq output found:\n' - printf -- '---- snip ----\n%s\n---- snip ----\n' "$out" - exit 1 - fi + for (( i=0 ; i < 2000 ; i++ )) ; do + printf '#### Test cycle %d (usingbzip=%s,tarfileonlocaldisk=%s):\n' "$i" "$use_bzip2" "$use_localdiskfortar" + /cygdrive/c/Windows/system32/tar -xvf "$(cygpath -w "${tarfilename}")" + + for currf in "${testfiles[@]}" ; do + if [[ ! -r "$currf" ]] ; then + printf '## ERROR: File %q not found.\n' "$currf" + return 1 + fi + if [[ ! -s "$currf" ]] ; then + printf '## ERROR: File %q is empty (ls -l == "%s").\n' "$currf" "$(ls -l "$currf")" + return 1 + fi + + out="$(od -A x -t x1 -v "$currf" | grep -F ' 00' | head -n 5)" + + if [[ "$out" != '' ]] ; then + printf '## ERROR: Zero byte in plain /usr/bin/seq output %q found:\n' "$currf" + printf -- '---- snip ----\n%s\n---- snip ----\n' "$out" + return 1 + fi + done + + rm -f -- "${testfiles[@]}" + done - rm -f '10000seq.txt' -done + printf '##### SUCCESS\n' -printf '# SUCCESS\n' + return 0 +} + + +# +# main +# + +export PATH='/bin:/usr/bin' + +if [[ ! -x '/cygdrive/c/Windows/system32/tar' ]] ; then + printf $"%s: %s not found.\n" \ + "$0" '/cygdrive/c/Windows/system32/tar' 1>&2 + exit 1 +fi + +# Set umask=0000 to avoid permission trouble on SMB filesystems +umask 0000 -exit 0 +test_wintar_seq true true +exit $? # EOF. -- 2.45.1 From 77d1590c0d1b51ac0106328c64720e293d9dc790 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 16 Nov 2024 15:22:20 +0100 Subject: [PATCH 2/5] daemon,sys: Rename kernel driver op prefix from |NFS41_| to |NFS41_SYSOP_| Rename kernel driver op prefix from |NFS41_| to |NFS41_SYSOP_| to avoid confusion. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/acl.c | 4 +- daemon/daemon_debug.c | 41 ++++++++++---------- daemon/ea.c | 8 ++-- daemon/getattr.c | 6 +-- daemon/lock.c | 8 ++-- daemon/mount.c | 12 +++--- daemon/nfs41_daemon.c | 2 +- daemon/open.c | 12 +++--- daemon/readdir.c | 4 +- daemon/readwrite.c | 4 +- daemon/setattr.c | 4 +- daemon/symlink.c | 4 +- daemon/upcall.c | 14 +++---- daemon/volume.c | 4 +- sys/nfs41_driver.h | 42 ++++++++++----------- sys/nfs41sys_acl.c | 4 +- sys/nfs41sys_debug.c | 36 +++++++++--------- sys/nfs41sys_dir.c | 2 +- sys/nfs41sys_driver.c | 4 +- sys/nfs41sys_ea.c | 6 +-- sys/nfs41sys_fileinfo.c | 4 +- sys/nfs41sys_lock.c | 4 +- sys/nfs41sys_mount.c | 4 +- sys/nfs41sys_openclose.c | 4 +- sys/nfs41sys_readwrite.c | 4 +- sys/nfs41sys_symlink.c | 4 +- sys/nfs41sys_updowncall.c | 78 +++++++++++++++++++-------------------- sys/nfs41sys_volinfo.c | 2 +- 28 files changed, 163 insertions(+), 162 deletions(-) diff --git a/daemon/acl.c b/daemon/acl.c index b9b0191..27e04f2 100644 --- a/daemon/acl.c +++ b/daemon/acl.c @@ -64,7 +64,7 @@ static int parse_getacl(unsigned char *buffer, uint32_t length, status = safe_read(&buffer, &length, &args->query, sizeof(args->query)); if (status) goto out; - DPRINTF(1, ("parsing NFS41_ACL_QUERY: info_class=%d\n", args->query)); + DPRINTF(1, ("parsing NFS41_SYSOP_ACL_QUERY: info_class=%d\n", args->query)); out: return status; } @@ -526,7 +526,7 @@ static int parse_setacl(unsigned char *buffer, uint32_t length, if (status) goto out; args->sec_desc = (PSECURITY_DESCRIPTOR)buffer; - DPRINTF(1, ("parsing NFS41_ACL_SET: info_class=%d sec_desc_len=%d\n", + DPRINTF(1, ("parsing NFS41_SYSOP_ACL_SET: info_class=%d sec_desc_len=%d\n", args->query, sec_desc_len)); out: return status; diff --git a/daemon/daemon_debug.c b/daemon/daemon_debug.c index a8d4f25..15a3855 100644 --- a/daemon/daemon_debug.c +++ b/daemon/daemon_debug.c @@ -426,26 +426,27 @@ const char* opcode2string(nfs41_opcodes opcode) { switch(opcode) { #define NFSOPCODE_TO_STRLITERAL(e) case e: return #e; - NFSOPCODE_TO_STRLITERAL(NFS41_INVALID_OPCODE0) - NFSOPCODE_TO_STRLITERAL(NFS41_SHUTDOWN) - NFSOPCODE_TO_STRLITERAL(NFS41_MOUNT) - NFSOPCODE_TO_STRLITERAL(NFS41_UNMOUNT) - NFSOPCODE_TO_STRLITERAL(NFS41_OPEN) - NFSOPCODE_TO_STRLITERAL(NFS41_CLOSE) - NFSOPCODE_TO_STRLITERAL(NFS41_READ) - NFSOPCODE_TO_STRLITERAL(NFS41_WRITE) - NFSOPCODE_TO_STRLITERAL(NFS41_LOCK) - NFSOPCODE_TO_STRLITERAL(NFS41_UNLOCK) - NFSOPCODE_TO_STRLITERAL(NFS41_DIR_QUERY) - NFSOPCODE_TO_STRLITERAL(NFS41_FILE_QUERY) - NFSOPCODE_TO_STRLITERAL(NFS41_FILE_QUERY_TIME_BASED_COHERENCY) - NFSOPCODE_TO_STRLITERAL(NFS41_FILE_SET) - NFSOPCODE_TO_STRLITERAL(NFS41_EA_SET) - NFSOPCODE_TO_STRLITERAL(NFS41_EA_GET) - NFSOPCODE_TO_STRLITERAL(NFS41_SYMLINK) - NFSOPCODE_TO_STRLITERAL(NFS41_VOLUME_QUERY) - NFSOPCODE_TO_STRLITERAL(NFS41_ACL_QUERY) - NFSOPCODE_TO_STRLITERAL(NFS41_ACL_SET) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_INVALID_OPCODE0) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_SHUTDOWN) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_MOUNT) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_UNMOUNT) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_OPEN) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_CLOSE) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_READ) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_WRITE) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_LOCK) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_UNLOCK) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_DIR_QUERY) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_FILE_QUERY) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_FILE_SET) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_EA_SET) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_EA_GET) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_SYMLINK) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_VOLUME_QUERY) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_ACL_QUERY) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_ACL_SET) + NFSOPCODE_TO_STRLITERAL(NFS41_SYSOP_INVALID_OPCODE1) default: break; } return "<unknown NFS41 opcode>"; diff --git a/daemon/ea.c b/daemon/ea.c index ae967df..8c94588 100644 --- a/daemon/ea.c +++ b/daemon/ea.c @@ -143,7 +143,7 @@ out: } -/* NFS41_EA_SET */ +/* NFS41_SYSOP_EA_SET */ static int parse_setexattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -157,7 +157,7 @@ static int parse_setexattr(unsigned char *buffer, uint32_t length, nfs41_upcall if (status) goto out; args->buf = buffer; - DPRINTF(1, ("parsing NFS41_EA_SET: mode=%o\n", args->mode)); + DPRINTF(1, ("parsing NFS41_SYSOP_EA_SET: mode=%o\n", args->mode)); out: return status; } @@ -211,7 +211,7 @@ static int marshall_setexattr(unsigned char *buffer, uint32_t *length, nfs41_upc } -/* NFS41_EA_GET */ +/* NFS41_SYSOP_EA_GET */ static int parse_getexattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -231,7 +231,7 @@ static int parse_getexattr(unsigned char *buffer, uint32_t length, nfs41_upcall if (status) goto out; args->ealist = args->ealist_len ? buffer : NULL; - DPRINTF(1, ("parsing NFS41_EA_GET: buf_len=%d Index %d Restart %d " + DPRINTF(1, ("parsing NFS41_SYSOP_EA_GET: buf_len=%d Index %d Restart %d " "Single %d\n", args->buf_len,args->eaindex, args->restart, args->single)); out: return status; diff --git a/daemon/getattr.c b/daemon/getattr.c index f6f7e3a..8356062 100644 --- a/daemon/getattr.c +++ b/daemon/getattr.c @@ -27,7 +27,7 @@ #include "nfs41_build_features.h" #include "nfs41_ops.h" #include "name_cache.h" -#include "nfs41_driver.h" /* only for |NFS41_FILE_QUERY*| */ +#include "nfs41_driver.h" /* only for |NFS41_SYSOP_FILE_QUERY*| */ #include "upcall.h" #include "daemon_debug.h" @@ -58,7 +58,7 @@ int nfs41_cached_getattr( return status; } -/* NFS41_FILE_QUERY, NFS41_FILE_QUERY_TIME_BASED_COHERENCY */ +/* NFS41_SYSOP_FILE_QUERY, NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY */ static int parse_getattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -270,7 +270,7 @@ static int marshall_getattr(unsigned char *buffer, uint32_t *length, nfs41_upcal } status = safe_write(&buffer, length, &args->ctime, sizeof(args->ctime)); if (status) goto out; - DPRINTF(1, ("NFS41_FILE_QUERY: downcall changattr=%llu\n", args->ctime)); + DPRINTF(1, ("NFS41_SYSOP_FILE_QUERY: downcall changattr=%llu\n", args->ctime)); out: return status; } diff --git a/daemon/lock.c b/daemon/lock.c index 7f72188..e79ca26 100644 --- a/daemon/lock.c +++ b/daemon/lock.c @@ -166,7 +166,7 @@ static void open_unlock_remove( } -/* NFS41_LOCK */ +/* NFS41_SYSOP_LOCK */ static int parse_lock(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -181,7 +181,7 @@ static int parse_lock(unsigned char *buffer, uint32_t length, nfs41_upcall *upca status = safe_read(&buffer, &length, &args->blocking, sizeof(BOOLEAN)); if (status) goto out; - DPRINTF(1, ("parsing NFS41_LOCK: offset=0x%llx length=0x%llx exclusive=%u " + DPRINTF(1, ("parsing NFS41_SYSOP_LOCK: offset=0x%llx length=0x%llx exclusive=%u " "blocking=%u\n", args->offset, args->length, args->exclusive, args->blocking)); out: @@ -302,7 +302,7 @@ out: } -/* NFS41_UNLOCK */ +/* NFS41_SYSOP_UNLOCK */ static int parse_unlock(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -314,7 +314,7 @@ static int parse_unlock(unsigned char *buffer, uint32_t length, nfs41_upcall *up args->buf = buffer; args->buf_len = length; - DPRINTF(1, ("parsing NFS41_UNLOCK: count=%u\n", args->count)); + DPRINTF(1, ("parsing NFS41_SYSOP_UNLOCK: count=%u\n", args->count)); out: return status; } diff --git a/daemon/mount.c b/daemon/mount.c index 7db317a..e508592 100644 --- a/daemon/mount.c +++ b/daemon/mount.c @@ -34,7 +34,7 @@ #endif /* NFS41_DRIVER_USE_AUTHENTICATIONID_FOR_MOUNT_NAMESPACE */ -/* NFS41_MOUNT */ +/* NFS41_SYSOP_MOUNT */ static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -53,13 +53,13 @@ static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upc status = safe_read(&buffer, &length, &args->use_nfspubfh, sizeof(DWORD)); if (status) goto out; - DPRINTF(1, ("parsing NFS41_MOUNT: hostport='%s' root='%s' " + DPRINTF(1, ("parsing NFS41_SYSOP_MOUNT: hostport='%s' root='%s' " "sec_flavor='%s' rsize=%d wsize=%d use_nfspubfh=%d\n", args->hostport, args->path, secflavorop2name(args->sec_flavor), args->rsize, args->wsize, args->use_nfspubfh)); return status; out: - DPRINTF(1, ("parsing NFS41_MOUNT: failed %d\n", status)); + DPRINTF(1, ("parsing NFS41_SYSOP_MOUNT: failed %d\n", status)); return status; } @@ -240,7 +240,7 @@ static int marshall_mount(unsigned char *buffer, uint32_t *length, nfs41_upcall { mount_upcall_args *args = &upcall->args.mount; int status; - DPRINTF(2, ("NFS41_MOUNT: writing pointer to nfs41_root 0x%p, version %d, " + DPRINTF(2, ("NFS41_SYSOP_MOUNT: writing pointer to nfs41_root 0x%p, version %d, " "lease_time %d\n", upcall->root_ref, NFS41D_VERSION, args->lease_time)); status = safe_write(&buffer, length, &upcall->root_ref, sizeof(HANDLE)); if (status) goto out; @@ -268,10 +268,10 @@ const nfs41_upcall_op nfs41_op_mount = { }; -/* NFS41_UNMOUNT */ +/* NFS41_SYSOP_UNMOUNT */ static int parse_unmount(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { - DPRINTF(1, ("parsing NFS41_UNMOUNT: root=0x%p\n", upcall->root_ref)); + DPRINTF(1, ("parsing NFS41_SYSOP_UNMOUNT: root=0x%p\n", upcall->root_ref)); return ERROR_SUCCESS; } diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c index ede4c58..e9fec3a 100644 --- a/daemon/nfs41_daemon.c +++ b/daemon/nfs41_daemon.c @@ -193,7 +193,7 @@ static unsigned int nfsd_worker_thread_main(void *args) goto write_downcall; } - if (upcall.opcode == NFS41_SHUTDOWN) { + if (upcall.opcode == NFS41_SYSOP_SHUTDOWN) { printf("Shutting down...\n"); exit(0); } diff --git a/daemon/open.c b/daemon/open.c index 83fcac1..756fd9b 100644 --- a/daemon/open.c +++ b/daemon/open.c @@ -378,7 +378,7 @@ out: return status; } -/* NFS41_OPEN */ +/* NFS41_SYSOP_OPEN */ static int parse_open(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -414,7 +414,7 @@ static int parse_open(unsigned char *buffer, uint32_t length, nfs41_upcall *upca if (status) goto out; #ifdef NFS41_DRIVER_FEATURE_LOCAL_UIDGID_IN_NFSV3ATTRIBUTES - DPRINTF(1, ("parsing NFS41_OPEN: filename='%s' access mask=%d " + DPRINTF(1, ("parsing NFS41_SYSOP_OPEN: filename='%s' access mask=%d " "access mode=%d\n\tfile attrs=0x%x create attrs=0x%x " "(kernel) disposition=%d\n\topen_owner_id=%d mode=%o " "owner_local_uid=%u owner_group_local_gid=%u " @@ -425,7 +425,7 @@ static int parse_open(unsigned char *buffer, uint32_t length, nfs41_upcall *upca args->srv_open, args->symlink.path, args->ea)); #else - DPRINTF(1, ("parsing NFS41_OPEN: filename='%s' access mask=%d " + DPRINTF(1, ("parsing NFS41_SYSOP_OPEN: filename='%s' access mask=%d " "access mode=%d\n\tfile attrs=0x%x create attrs=0x%x " "(kernel) disposition=%d\n\topen_owner_id=%d mode=%o " "srv_open=0x%p symlink=%s ea=0x%p\n", args->path, args->access_mask, @@ -1088,7 +1088,7 @@ static int marshall_open(unsigned char *buffer, uint32_t *length, nfs41_upcall * goto out; } } - DPRINTF(2, ("NFS41_OPEN: downcall open_state=0x%p mode %o changeattr 0x%llu\n", + DPRINTF(2, ("NFS41_SYSOP_OPEN: downcall open_state=0x%p mode %o changeattr 0x%llu\n", upcall->state_ref, args->mode, args->changeattr)); out: return status; @@ -1139,7 +1139,7 @@ out: } -/* NFS41_CLOSE */ +/* NFS41_SYSOP_CLOSE */ static int parse_close(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -1156,7 +1156,7 @@ static int parse_close(unsigned char *buffer, uint32_t length, nfs41_upcall *upc if (status) goto out; } - DPRINTF(1, ("parsing NFS41_CLOSE: remove=%d srv_open=%x renamed=%d " + DPRINTF(1, ("parsing NFS41_SYSOP_CLOSE: remove=%d srv_open=%x renamed=%d " "filename='%s'\n", args->remove, args->srv_open, args->renamed, args->remove ? args->path : "")); out: diff --git a/daemon/readdir.c b/daemon/readdir.c index a2d7772..d244569 100644 --- a/daemon/readdir.c +++ b/daemon/readdir.c @@ -255,7 +255,7 @@ typedef union _FILE_DIR_INFO_UNION { } FILE_DIR_INFO_UNION, *PFILE_DIR_INFO_UNION; -/* NFS41_DIR_QUERY */ +/* NFS41_SYSOP_DIR_QUERY */ static int parse_readdir(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -278,7 +278,7 @@ static int parse_readdir(unsigned char *buffer, uint32_t length, nfs41_upcall *u args->root = upcall->root_ref; args->state = upcall->state_ref; - DPRINTF(1, ("parsing NFS41_DIR_QUERY: info_class=%d buf_len=%d " + DPRINTF(1, ("parsing NFS41_SYSOP_DIR_QUERY: info_class=%d buf_len=%d " "filter='%s'\n\tInitial\\Restart\\Single %d\\%d\\%d buf=0x%p\n", args->query_class, args->buf_len, args->filter, args->initial, args->restart, args->single, args->kbuf)); diff --git a/daemon/readwrite.c b/daemon/readwrite.c index 14e4bcb..81be0dd 100644 --- a/daemon/readwrite.c +++ b/daemon/readwrite.c @@ -55,7 +55,7 @@ out: return status; } -/* NFS41_READ */ +/* NFS41_SYSOP_READ */ static int read_from_mds( IN nfs41_upcall *upcall, IN stateid_arg *stateid) @@ -170,7 +170,7 @@ out: } -/* NFS41_WRITE */ +/* NFS41_SYSOP_WRITE */ static int write_to_mds( IN nfs41_upcall *upcall, IN stateid_arg *stateid) diff --git a/daemon/setattr.c b/daemon/setattr.c index 5e401a8..0c67746 100644 --- a/daemon/setattr.c +++ b/daemon/setattr.c @@ -33,7 +33,7 @@ #include "daemon_debug.h" -/* NFS41_FILE_SET */ +/* NFS41_SYSOP_FILE_SET */ static int parse_setattr(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -50,7 +50,7 @@ static int parse_setattr(unsigned char *buffer, uint32_t length, nfs41_upcall *u args->root = upcall->root_ref; args->state = upcall->state_ref; - DPRINTF(1, ("parsing NFS41_FILE_SET: filename='%s' info_class=%d " + DPRINTF(1, ("parsing NFS41_SYSOP_FILE_SET: filename='%s' info_class=%d " "buf_len=%d\n", args->path, args->set_class, args->buf_len)); out: return status; diff --git a/daemon/symlink.c b/daemon/symlink.c index aaeb456..350114e 100644 --- a/daemon/symlink.c +++ b/daemon/symlink.c @@ -186,7 +186,7 @@ out: } -/* NFS41_SYMLINK */ +/* NFS41_SYSOP_SYMLINK */ static int parse_symlink(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { symlink_upcall_args *args = &upcall->args.symlink; @@ -202,7 +202,7 @@ static int parse_symlink(unsigned char *buffer, uint32_t length, nfs41_upcall *u else args->target_set = NULL; - DPRINTF(1, ("parsing NFS41_SYMLINK: path='%s' set=%u target='%s'\n", + DPRINTF(1, ("parsing NFS41_SYSOP_SYMLINK: path='%s' set=%u target='%s'\n", args->path, args->set, args->target_set)); out: return status; diff --git a/daemon/upcall.c b/daemon/upcall.c index f19e1b3..67d6ef3 100644 --- a/daemon/upcall.c +++ b/daemon/upcall.c @@ -26,7 +26,7 @@ #include "nfs41_build_features.h" #include "upcall.h" -#include "nfs41_driver.h" /* only for |NFS41_UNMOUNT| */ +#include "nfs41_driver.h" /* only for |NFS41_SYSOP_UNMOUNT| */ #include "daemon_debug.h" #include "util.h" @@ -60,8 +60,8 @@ static const nfs41_upcall_op *g_upcall_op_table[] = { &nfs41_op_lock, &nfs41_op_unlock, &nfs41_op_readdir, - &nfs41_op_getattr, /* NFS41_FILE_QUERY */ - &nfs41_op_getattr, /* NFS41_FILE_QUERY_TIME_BASED_COHERENCY */ + &nfs41_op_getattr, /* NFS41_SYSOP_FILE_QUERY */ + &nfs41_op_getattr, /* NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY */ &nfs41_op_setattr, &nfs41_op_getexattr, &nfs41_op_setexattr, @@ -177,8 +177,8 @@ int upcall_parse( op = g_upcall_op_table[upcall_upcode]; if (op) { - /* |NFS41_UNMOUNT| has 0 payload */ - if (upcall_upcode != NFS41_UNMOUNT) { + /* |NFS41_SYSOP_UNMOUNT| has 0 payload */ + if (upcall_upcode != NFS41_SYSOP_UNMOUNT) { EASSERT_MSG(op->arg_size >= sizeof(void*), ("upcall->opcode=%u\n", (unsigned int)upcall_upcode)); } @@ -186,8 +186,8 @@ int upcall_parse( } if (op && op->parse) { - /* |NFS41_UNMOUNT| has 0 payload */ - if (upcall_upcode != NFS41_UNMOUNT) { + /* |NFS41_SYSOP_UNMOUNT| has 0 payload */ + if (upcall_upcode != NFS41_SYSOP_UNMOUNT) { EASSERT(length > 0); } diff --git a/daemon/volume.c b/daemon/volume.c index 96084a0..78d21c5 100644 --- a/daemon/volume.c +++ b/daemon/volume.c @@ -42,7 +42,7 @@ #define VOLUME_CACHE_EXPIRATION 20 -/* NFS41_VOLUME_QUERY */ +/* NFS41_SYSOP_VOLUME_QUERY */ static int parse_volume(unsigned char *buffer, uint32_t length, nfs41_upcall *upcall) { int status; @@ -51,7 +51,7 @@ static int parse_volume(unsigned char *buffer, uint32_t length, nfs41_upcall *up status = safe_read(&buffer, &length, &args->query, sizeof(FS_INFORMATION_CLASS)); if (status) goto out; - DPRINTF(1, ("parsing NFS41_VOLUME_QUERY: query=%d\n", args->query)); + DPRINTF(1, ("parsing NFS41_SYSOP_VOLUME_QUERY: query=%d\n", args->query)); out: return status; } diff --git a/sys/nfs41_driver.h b/sys/nfs41_driver.h index d53f3ed..c08e8fb 100644 --- a/sys/nfs41_driver.h +++ b/sys/nfs41_driver.h @@ -62,27 +62,27 @@ /* |_nfs41_opcodes| and |g_upcall_op_table| must be in sync! */ typedef enum _nfs41_opcodes { - NFS41_INVALID_OPCODE0, - NFS41_MOUNT, - NFS41_UNMOUNT, - NFS41_OPEN, - NFS41_CLOSE, - NFS41_READ, - NFS41_WRITE, - NFS41_LOCK, - NFS41_UNLOCK, - NFS41_DIR_QUERY, - NFS41_FILE_QUERY, - NFS41_FILE_QUERY_TIME_BASED_COHERENCY, - NFS41_FILE_SET, - NFS41_EA_GET, - NFS41_EA_SET, - NFS41_SYMLINK, - NFS41_VOLUME_QUERY, - NFS41_ACL_QUERY, - NFS41_ACL_SET, - NFS41_SHUTDOWN, - NFS41_INVALID_OPCODE1 + NFS41_SYSOP_INVALID_OPCODE0, + NFS41_SYSOP_MOUNT, + NFS41_SYSOP_UNMOUNT, + NFS41_SYSOP_OPEN, + NFS41_SYSOP_CLOSE, + NFS41_SYSOP_READ, + NFS41_SYSOP_WRITE, + NFS41_SYSOP_LOCK, + NFS41_SYSOP_UNLOCK, + NFS41_SYSOP_DIR_QUERY, + NFS41_SYSOP_FILE_QUERY, + NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY, + NFS41_SYSOP_FILE_SET, + NFS41_SYSOP_EA_GET, + NFS41_SYSOP_EA_SET, + NFS41_SYSOP_SYMLINK, + NFS41_SYSOP_VOLUME_QUERY, + NFS41_SYSOP_ACL_QUERY, + NFS41_SYSOP_ACL_SET, + NFS41_SYSOP_SHUTDOWN, + NFS41_SYSOP_INVALID_OPCODE1 } nfs41_opcodes; enum rpcsec_flavors { diff --git a/sys/nfs41sys_acl.c b/sys/nfs41sys_acl.c index 55c5789..1d64293 100644 --- a/sys/nfs41sys_acl.c +++ b/sys/nfs41sys_acl.c @@ -254,7 +254,7 @@ NTSTATUS nfs41_QuerySecurityInformation( goto out; } - status = nfs41_UpcallCreate(NFS41_ACL_QUERY, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_ACL_QUERY, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -392,7 +392,7 @@ NTSTATUS nfs41_SetSecurityInformation( } } - status = nfs41_UpcallCreate(NFS41_ACL_SET, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_ACL_SET, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_debug.c b/sys/nfs41sys_debug.c index e6b22e6..eb7ab0e 100644 --- a/sys/nfs41sys_debug.c +++ b/sys/nfs41sys_debug.c @@ -655,24 +655,24 @@ void print_caching_level(int on, ULONG flag, PUNICODE_STRING name) const char *opcode2string(int opcode) { switch(opcode) { - case NFS41_SHUTDOWN: return "NFS41_SHUTDOWN"; - case NFS41_MOUNT: return "NFS41_MOUNT"; - case NFS41_UNMOUNT: return "NFS41_UNMOUNT"; - case NFS41_OPEN: return "NFS41_OPEN"; - case NFS41_CLOSE: return "NFS41_CLOSE"; - case NFS41_READ: return "NFS41_READ"; - case NFS41_WRITE: return "NFS41_WRITE"; - case NFS41_LOCK: return "NFS41_LOCK"; - case NFS41_UNLOCK: return "NFS41_UNLOCK"; - case NFS41_DIR_QUERY: return "NFS41_DIR_QUERY"; - case NFS41_FILE_QUERY: return "NFS41_FILE_QUERY"; - case NFS41_FILE_SET: return "NFS41_FILE_SET"; - case NFS41_EA_SET: return "NFS41_EA_SET"; - case NFS41_EA_GET: return "NFS41_EA_GET"; - case NFS41_SYMLINK: return "NFS41_SYMLINK"; - case NFS41_VOLUME_QUERY: return "NFS41_VOLUME_QUERY"; - case NFS41_ACL_QUERY: return "NFS41_ACL_QUERY"; - case NFS41_ACL_SET: return "NFS41_ACL_SET"; + case NFS41_SYSOP_SHUTDOWN: return "NFS41_SYSOP_SHUTDOWN"; + case NFS41_SYSOP_MOUNT: return "NFS41_SYSOP_MOUNT"; + case NFS41_SYSOP_UNMOUNT: return "NFS41_SYSOP_UNMOUNT"; + case NFS41_SYSOP_OPEN: return "NFS41_SYSOP_OPEN"; + case NFS41_SYSOP_CLOSE: return "NFS41_SYSOP_CLOSE"; + case NFS41_SYSOP_READ: return "NFS41_SYSOP_READ"; + case NFS41_SYSOP_WRITE: return "NFS41_SYSOP_WRITE"; + case NFS41_SYSOP_LOCK: return "NFS41_SYSOP_LOCK"; + case NFS41_SYSOP_UNLOCK: return "NFS41_SYSOP_UNLOCK"; + case NFS41_SYSOP_DIR_QUERY: return "NFS41_SYSOP_DIR_QUERY"; + case NFS41_SYSOP_FILE_QUERY: return "NFS41_SYSOP_FILE_QUERY"; + case NFS41_SYSOP_FILE_SET: return "NFS41_SYSOP_FILE_SET"; + case NFS41_SYSOP_EA_SET: return "NFS41_SYSOP_EA_SET"; + case NFS41_SYSOP_EA_GET: return "NFS41_SYSOP_EA_GET"; + case NFS41_SYSOP_SYMLINK: return "NFS41_SYSOP_SYMLINK"; + case NFS41_SYSOP_VOLUME_QUERY: return "NFS41_SYSOP_VOLUME_QUERY"; + case NFS41_SYSOP_ACL_QUERY: return "NFS41_SYSOP_ACL_QUERY"; + case NFS41_SYSOP_ACL_SET: return "NFS41_SYSOP_ACL_SET"; default: return "UNKNOWN"; } } diff --git a/sys/nfs41sys_dir.c b/sys/nfs41sys_dir.c index 83109ed..0031cbf 100644 --- a/sys/nfs41sys_dir.c +++ b/sys/nfs41sys_dir.c @@ -256,7 +256,7 @@ NTSTATUS nfs41_QueryDirectory( status = STATUS_NOT_SUPPORTED; goto out; } - status = nfs41_UpcallCreate(NFS41_DIR_QUERY, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_DIR_QUERY, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_driver.c b/sys/nfs41sys_driver.c index 362dc82..c43a5c0 100644 --- a/sys/nfs41sys_driver.c +++ b/sys/nfs41sys_driver.c @@ -283,7 +283,7 @@ NTSTATUS nfs41_shutdown_daemon( nfs41_updowncall_entry *entry = NULL; DbgEn(); - status = nfs41_UpcallCreate(NFS41_SHUTDOWN, NULL, INVALID_HANDLE_VALUE, + status = nfs41_UpcallCreate(NFS41_SYSOP_SHUTDOWN, NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, version, NULL, &entry); if (status) goto out; @@ -1247,7 +1247,7 @@ VOID fcbopen_main(PVOID ctx) NFS41GetNetRootExtension(cur->fcb->pNetRoot); /* place an upcall for this srv_open */ status = nfs41_UpcallCreate( - NFS41_FILE_QUERY_TIME_BASED_COHERENCY, + NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY, &cur->nfs41_fobx->sec_ctx, cur->session, cur->nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, NULL, &entry); diff --git a/sys/nfs41sys_ea.c b/sys/nfs41sys_ea.c index dee8ef1..fbd61cb 100644 --- a/sys/nfs41sys_ea.c +++ b/sys/nfs41sys_ea.c @@ -317,7 +317,7 @@ NTSTATUS nfs41_SetEaInformation( status = check_nfs41_setea_args(RxContext); if (status) goto out; - status = nfs41_UpcallCreate(NFS41_EA_SET, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_EA_SET, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -442,7 +442,7 @@ NTSTATUS QueryCygwinSymlink( TargetName.MaximumLength = (USHORT)min(RxContext->Info.LengthRemaining - HeaderLen, 0xFFFF); - status = nfs41_UpcallCreate(NFS41_SYMLINK, &Fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_SYMLINK, &Fobx->sec_ctx, VNetRootContext->session, Fobx->nfs41_open_state, NetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -591,7 +591,7 @@ NTSTATUS nfs41_QueryEaInformation( if (status != STATUS_NONEXISTENT_EA_ENTRY) goto out; - status = nfs41_UpcallCreate(NFS41_EA_GET, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_EA_GET, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_fileinfo.c b/sys/nfs41sys_fileinfo.c index 5a21916..a06fe0e 100644 --- a/sys/nfs41sys_fileinfo.c +++ b/sys/nfs41sys_fileinfo.c @@ -317,7 +317,7 @@ NTSTATUS nfs41_QueryFileInformation( goto out; } - status = nfs41_UpcallCreate(NFS41_FILE_QUERY, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_FILE_QUERY, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) { @@ -656,7 +656,7 @@ NTSTATUS nfs41_SetFileInformation( } } - status = nfs41_UpcallCreate(NFS41_FILE_SET, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_FILE_SET, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_lock.c b/sys/nfs41sys_lock.c index 50f0716..12e5a45 100644 --- a/sys/nfs41sys_lock.c +++ b/sys/nfs41sys_lock.c @@ -261,7 +261,7 @@ NTSTATUS nfs41_Lock( /* RxReleaseFcbResourceForThreadInMRx(RxContext, RxContext->pFcb, LowIoContext->ResourceThreadId); */ - status = nfs41_UpcallCreate(NFS41_LOCK, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_LOCK, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -360,7 +360,7 @@ NTSTATUS nfs41_Unlock( /* RxReleaseFcbResourceForThreadInMRx(RxContext, RxContext->pFcb, LowIoContext->ResourceThreadId); */ - status = nfs41_UpcallCreate(NFS41_UNLOCK, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_UNLOCK, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_mount.c b/sys/nfs41sys_mount.c index 76da602..37b7f0c 100644 --- a/sys/nfs41sys_mount.c +++ b/sys/nfs41sys_mount.c @@ -181,7 +181,7 @@ NTSTATUS nfs41_unmount( #ifdef DEBUG_MOUNT DbgEn(); #endif - status = nfs41_UpcallCreate(NFS41_UNMOUNT, NULL, session, + status = nfs41_UpcallCreate(NFS41_SYSOP_UNMOUNT, NULL, session, INVALID_HANDLE_VALUE, version, NULL, &entry); if (status) goto out; @@ -252,7 +252,7 @@ NTSTATUS nfs41_mount( DbgP("Server Name '%wZ' Mount Point '%wZ' SecFlavor %d\n", &config->SrvName, &config->MntPt, sec_flavor); #endif - status = nfs41_UpcallCreate(NFS41_MOUNT, NULL, *session, + status = nfs41_UpcallCreate(NFS41_SYSOP_MOUNT, NULL, *session, INVALID_HANDLE_VALUE, *version, &config->MntPt, &entry); if (status) goto out; diff --git a/sys/nfs41sys_openclose.c b/sys/nfs41sys_openclose.c index 0a182af..af0cf10 100644 --- a/sys/nfs41sys_openclose.c +++ b/sys/nfs41sys_openclose.c @@ -583,7 +583,7 @@ NTSTATUS nfs41_Create( status = check_nfs41_create_args(RxContext); if (status) goto out; - status = nfs41_UpcallCreate(NFS41_OPEN, NULL, + status = nfs41_UpcallCreate(NFS41_SYSOP_OPEN, NULL, pVNetRootContext->session, INVALID_HANDLE_VALUE, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); @@ -1009,7 +1009,7 @@ NTSTATUS nfs41_CloseSrvOpen( nfs41_remove_fcb_entry(RxContext->pFcb); } - status = nfs41_UpcallCreate(NFS41_CLOSE, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_CLOSE, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_readwrite.c b/sys/nfs41sys_readwrite.c index c039d23..90d6d07 100644 --- a/sys/nfs41sys_readwrite.c +++ b/sys/nfs41sys_readwrite.c @@ -240,7 +240,7 @@ NTSTATUS nfs41_Read( status = check_nfs41_read_args(RxContext); if (status) goto out; - status = nfs41_UpcallCreate(NFS41_READ, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_READ, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -357,7 +357,7 @@ NTSTATUS nfs41_Write( status = check_nfs41_write_args(RxContext); if (status) goto out; - status = nfs41_UpcallCreate(NFS41_WRITE, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_WRITE, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_symlink.c b/sys/nfs41sys_symlink.c index 938a733..b6cacd5 100644 --- a/sys/nfs41sys_symlink.c +++ b/sys/nfs41sys_symlink.c @@ -276,7 +276,7 @@ NTSTATUS nfs41_SetReparsePoint( TargetName.Buffer = &Reparse->SymbolicLinkReparseBuffer.PathBuffer[ Reparse->SymbolicLinkReparseBuffer.PrintNameOffset/sizeof(WCHAR)]; - status = nfs41_UpcallCreate(NFS41_SYMLINK, &Fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_SYMLINK, &Fobx->sec_ctx, VNetRootContext->session, Fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; @@ -363,7 +363,7 @@ NTSTATUS nfs41_GetReparsePoint( TargetName.MaximumLength = (USHORT)min(FsCtl->OutputBufferLength - HeaderLen, 0xFFFF); - status = nfs41_UpcallCreate(NFS41_SYMLINK, &Fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_SYMLINK, &Fobx->sec_ctx, VNetRootContext->session, Fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; diff --git a/sys/nfs41sys_updowncall.c b/sys/nfs41sys_updowncall.c index f79712e..346b0de 100644 --- a/sys/nfs41sys_updowncall.c +++ b/sys/nfs41sys_updowncall.c @@ -227,60 +227,60 @@ NTSTATUS handle_upcall( } switch(entry->opcode) { - case NFS41_SHUTDOWN: + case NFS41_SYSOP_SHUTDOWN: status = marshal_nfs41_shutdown(entry, pbOut, cbOut, len); KeSetEvent(&entry->cond, 0, FALSE); break; - case NFS41_MOUNT: + case NFS41_SYSOP_MOUNT: status = marshal_nfs41_mount(entry, pbOut, cbOut, len); break; - case NFS41_UNMOUNT: + case NFS41_SYSOP_UNMOUNT: status = marshal_nfs41_unmount(entry, pbOut, cbOut, len); break; - case NFS41_OPEN: + case NFS41_SYSOP_OPEN: status = marshal_nfs41_open(entry, pbOut, cbOut, len); break; - case NFS41_READ: + case NFS41_SYSOP_READ: status = marshal_nfs41_rw(entry, pbOut, cbOut, len); break; - case NFS41_WRITE: + case NFS41_SYSOP_WRITE: status = marshal_nfs41_rw(entry, pbOut, cbOut, len); break; - case NFS41_LOCK: + case NFS41_SYSOP_LOCK: status = marshal_nfs41_lock(entry, pbOut, cbOut, len); break; - case NFS41_UNLOCK: + case NFS41_SYSOP_UNLOCK: status = marshal_nfs41_unlock(entry, pbOut, cbOut, len); break; - case NFS41_CLOSE: + case NFS41_SYSOP_CLOSE: status = marshal_nfs41_close(entry, pbOut, cbOut, len); break; - case NFS41_DIR_QUERY: + case NFS41_SYSOP_DIR_QUERY: status = marshal_nfs41_dirquery(entry, pbOut, cbOut, len); break; - case NFS41_FILE_QUERY: - case NFS41_FILE_QUERY_TIME_BASED_COHERENCY: + case NFS41_SYSOP_FILE_QUERY: + case NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY: status = marshal_nfs41_filequery(entry, pbOut, cbOut, len); break; - case NFS41_FILE_SET: + case NFS41_SYSOP_FILE_SET: status = marshal_nfs41_fileset(entry, pbOut, cbOut, len); break; - case NFS41_EA_SET: + case NFS41_SYSOP_EA_SET: status = marshal_nfs41_easet(entry, pbOut, cbOut, len); break; - case NFS41_EA_GET: + case NFS41_SYSOP_EA_GET: status = marshal_nfs41_eaget(entry, pbOut, cbOut, len); break; - case NFS41_SYMLINK: + case NFS41_SYSOP_SYMLINK: status = marshal_nfs41_symlink(entry, pbOut, cbOut, len); break; - case NFS41_VOLUME_QUERY: + case NFS41_SYSOP_VOLUME_QUERY: status = marshal_nfs41_volume(entry, pbOut, cbOut, len); break; - case NFS41_ACL_QUERY: + case NFS41_SYSOP_ACL_QUERY: status = marshal_nfs41_getacl(entry, pbOut, cbOut, len); break; - case NFS41_ACL_SET: + case NFS41_SYSOP_ACL_SET: status = marshal_nfs41_setacl(entry, pbOut, cbOut, len); break; default: @@ -563,16 +563,16 @@ NTSTATUS nfs41_downcall( if (cur->state == NFS41_NOT_WAITING) { DbgP("[downcall] Nobody is waiting for this request!!!\n"); switch(cur->opcode) { - case NFS41_WRITE: - case NFS41_READ: + case NFS41_SYSOP_WRITE: + case NFS41_SYSOP_READ: MmUnmapLockedPages(cur->buf, cur->u.ReadWrite.MdlAddress); break; - case NFS41_DIR_QUERY: + case NFS41_SYSOP_DIR_QUERY: MmUnmapLockedPages(cur->u.QueryFile.mdl_buf, cur->u.QueryFile.mdl); IoFreeMdl(cur->u.QueryFile.mdl); break; - case NFS41_OPEN: + case NFS41_SYSOP_OPEN: if (cur->u.Open.EaMdl) { MmUnmapLockedPages(cur->u.Open.EaBuffer, cur->u.Open.EaMdl); @@ -593,42 +593,42 @@ NTSTATUS nfs41_downcall( if (!tmp->status) { switch (tmp->opcode) { - case NFS41_MOUNT: + case NFS41_SYSOP_MOUNT: unmarshal_nfs41_mount(cur, &buf); break; - case NFS41_WRITE: - case NFS41_READ: + case NFS41_SYSOP_WRITE: + case NFS41_SYSOP_READ: status = unmarshal_nfs41_rw(cur, &buf); break; - case NFS41_OPEN: + case NFS41_SYSOP_OPEN: status = unmarshal_nfs41_open(cur, &buf); break; - case NFS41_DIR_QUERY: + case NFS41_SYSOP_DIR_QUERY: status = unmarshal_nfs41_dirquery(cur, &buf); break; - case NFS41_FILE_QUERY: - case NFS41_FILE_QUERY_TIME_BASED_COHERENCY: + case NFS41_SYSOP_FILE_QUERY: + case NFS41_SYSOP_FILE_QUERY_TIME_BASED_COHERENCY: unmarshal_nfs41_getattr(cur, &buf); break; - case NFS41_EA_GET: + case NFS41_SYSOP_EA_GET: unmarshal_nfs41_eaget(cur, &buf); break; - case NFS41_SYMLINK: + case NFS41_SYSOP_SYMLINK: unmarshal_nfs41_symlink(cur, &buf); break; - case NFS41_VOLUME_QUERY: + case NFS41_SYSOP_VOLUME_QUERY: unmarshal_nfs41_attrget(cur, cur->buf, &cur->buf_len, &buf); break; - case NFS41_ACL_QUERY: + case NFS41_SYSOP_ACL_QUERY: status = unmarshal_nfs41_getacl(cur, &buf); break; - case NFS41_FILE_SET: + case NFS41_SYSOP_FILE_SET: unmarshal_nfs41_setattr(cur, &cur->ChangeTime, &buf); break; - case NFS41_EA_SET: + case NFS41_SYSOP_EA_SET: unmarshal_nfs41_setattr(cur, &cur->ChangeTime, &buf); break; - case NFS41_ACL_SET: + case NFS41_SYSOP_ACL_SET: unmarshal_nfs41_setattr(cur, &cur->ChangeTime, &buf); break; } @@ -636,8 +636,8 @@ NTSTATUS nfs41_downcall( ExReleaseFastMutex(&cur->lock); if (cur->async_op) { switch (cur->opcode) { - case NFS41_WRITE: - case NFS41_READ: + case NFS41_SYSOP_WRITE: + case NFS41_SYSOP_READ: if (cur->status == STATUS_SUCCESS) { cur->u.ReadWrite.rxcontext->StoredStatus = STATUS_SUCCESS; diff --git a/sys/nfs41sys_volinfo.c b/sys/nfs41sys_volinfo.c index b153ddb..3648026 100644 --- a/sys/nfs41sys_volinfo.c +++ b/sys/nfs41sys_volinfo.c @@ -256,7 +256,7 @@ NTSTATUS nfs41_QueryVolumeInformation( status = STATUS_NOT_SUPPORTED; goto out; } - status = nfs41_UpcallCreate(NFS41_VOLUME_QUERY, &nfs41_fobx->sec_ctx, + status = nfs41_UpcallCreate(NFS41_SYSOP_VOLUME_QUERY, &nfs41_fobx->sec_ctx, pVNetRootContext->session, nfs41_fobx->nfs41_open_state, pNetRootContext->nfs41d_version, SrvOpen->pAlreadyPrefixedName, &entry); if (status) goto out; -- 2.45.1 From bc31112a08d800e67208cff9780b7d8d9bd2a6eb Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 16 Nov 2024 15:33:16 +0100 Subject: [PATCH 3/5] sys: |unmarshal_nfs41_getattr()|: Fix |cur->ChangeTime| datatype Fix |cur->ChangeTime| datatype in |unmarshal_nfs41_getattr()| Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_fileinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/nfs41sys_fileinfo.c b/sys/nfs41sys_fileinfo.c index a06fe0e..dae459d 100644 --- a/sys/nfs41sys_fileinfo.c +++ b/sys/nfs41sys_fileinfo.c @@ -157,7 +157,7 @@ void unmarshal_nfs41_getattr( unsigned char **buf) { unmarshal_nfs41_attrget(cur, cur->buf, &cur->buf_len, buf); - RtlCopyMemory(&cur->ChangeTime, *buf, sizeof(LONGLONG)); + RtlCopyMemory(&cur->ChangeTime, *buf, sizeof(ULONGLONG)); #ifdef DEBUG_MARSHAL_DETAIL if (cur->u.QueryFile.InfoClass == FileBasicInformation) DbgP("[unmarshal_nfs41_getattr] ChangeTime %llu\n", cur->ChangeTime); -- 2.45.1 From 0e39c121f1b08b3d4f4724c51c6ec28444e4d4de Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 16 Nov 2024 15:39:15 +0100 Subject: [PATCH 4/5] sys: Move |unmarshal_nfs41_attrget()| to nfs41sys_updowncall.c Move |unmarshal_nfs41_attrget()| from nfs41sys_volinfo.c to nfs41sys_updowncall.c Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- sys/nfs41sys_driver.h | 10 +++++----- sys/nfs41sys_updowncall.c | 18 ++++++++++++++++++ sys/nfs41sys_volinfo.c | 18 ------------------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/nfs41sys_driver.h b/sys/nfs41sys_driver.h index 721815e..9d582a6 100644 --- a/sys/nfs41sys_driver.h +++ b/sys/nfs41sys_driver.h @@ -788,6 +788,11 @@ NTSTATUS marshal_nfs41_header( unsigned char *buf, ULONG buf_len, ULONG *len); +void unmarshal_nfs41_attrget( + nfs41_updowncall_entry *cur, + PVOID attr_value, + ULONG *attr_len, + unsigned char **buf); NTSTATUS nfs41_UpcallCreate( IN DWORD opcode, IN PSECURITY_CLIENT_CONTEXT clnt_sec_ctx, @@ -834,11 +839,6 @@ NTSTATUS marshal_nfs41_volume( unsigned char *buf, ULONG buf_len, ULONG *len); -void unmarshal_nfs41_attrget( - nfs41_updowncall_entry *cur, - PVOID attr_value, - ULONG *attr_len, - unsigned char **buf); NTSTATUS nfs41_QueryVolumeInformation( IN OUT PRX_CONTEXT RxContext); void nfs41_create_volume_info( diff --git a/sys/nfs41sys_updowncall.c b/sys/nfs41sys_updowncall.c index 346b0de..b359d2a 100644 --- a/sys/nfs41sys_updowncall.c +++ b/sys/nfs41sys_updowncall.c @@ -160,6 +160,24 @@ static void unmarshal_nfs41_header( #endif } +void unmarshal_nfs41_attrget( + nfs41_updowncall_entry *cur, + PVOID attr_value, + ULONG *attr_len, + unsigned char **buf) +{ + ULONG buf_len; + RtlCopyMemory(&buf_len, *buf, sizeof(ULONG)); + if (buf_len > *attr_len) { + cur->status = STATUS_BUFFER_TOO_SMALL; + return; + } + *buf += sizeof(ULONG); + *attr_len = buf_len; + RtlCopyMemory(attr_value, *buf, buf_len); + *buf += buf_len; +} + NTSTATUS handle_upcall( IN PRX_CONTEXT RxContext, IN nfs41_updowncall_entry *entry, diff --git a/sys/nfs41sys_volinfo.c b/sys/nfs41sys_volinfo.c index 3648026..a3efb33 100644 --- a/sys/nfs41sys_volinfo.c +++ b/sys/nfs41sys_volinfo.c @@ -99,24 +99,6 @@ out: return status; } -void unmarshal_nfs41_attrget( - nfs41_updowncall_entry *cur, - PVOID attr_value, - ULONG *attr_len, - unsigned char **buf) -{ - ULONG buf_len; - RtlCopyMemory(&buf_len, *buf, sizeof(ULONG)); - if (buf_len > *attr_len) { - cur->status = STATUS_BUFFER_TOO_SMALL; - return; - } - *buf += sizeof(ULONG); - *attr_len = buf_len; - RtlCopyMemory(attr_value, *buf, buf_len); - *buf += buf_len; -} - static void print_queryvolume_args( PRX_CONTEXT RxContext) { -- 2.45.1 From 292707d8dac5de6f5b7744e52f7b0d2e8f3ac686 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 16 Nov 2024 16:25:31 +0100 Subject: [PATCH 5/5] cygwin: msnfs41client: Add cdb+drmemory Windows 32bit install paths to PATH msnfs41client.bash: Add cdb+drmemory Windows 32bit install paths to PATH Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- cygwin/devel/msnfs41client.bash | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/cygwin/devel/msnfs41client.bash b/cygwin/devel/msnfs41client.bash index f0a110c..68e187e 100755 --- a/cygwin/devel/msnfs41client.bash +++ b/cygwin/devel/msnfs41client.bash @@ -44,6 +44,15 @@ function is_windows_admin_account return 1 } +function is_windows_64bit +{ + if [[ -d '/cygdrive/c/Windows/SysWOW64/' ]] ; then + return 0 + else + return 1 + fi +} + function check_machine_arch { typeset winpwd @@ -303,7 +312,7 @@ function nfsclient_adddriver # 32bit applications can enumerate the ms-nfs41-client shares # (FIXME: technically nfs41rdr.inf should do this) # - if [[ -d '/cygdrive/c/Windows/SysWOW64/' ]] ; then + if is_windows_64bit ; then # copy from the 32bit install dir cp '../../../../../cygdrive/c/cygwin/lib/msnfs41client/nfs41_np.dll' '/cygdrive/c/Windows/SysWOW64/' fi @@ -330,7 +339,7 @@ function nfsclient_removedriver nfs_install.exe 0 rundll32.exe setupapi.dll,InstallHinfSection DefaultUninstall 132 ./nfs41rdr.inf rm /cygdrive/c/Windows/System32/nfs41_np.dll || true - if [[ -d '/cygdrive/c/Windows/SysWOW64/' ]] ; then + if is_windows_64bit ; then rm '/cygdrive/c/Windows/SysWOW64/nfs41_np.dll' || true fi rm /cygdrive/c/Windows/System32/drivers/nfs41_driver.sys || true @@ -775,16 +784,24 @@ function main # add Windows tools path (tasklist, taskkill etc.) PATH+=':/cygdrive/c/Windows/system32/' - # path to WinDBG cdb (fixme: 64bit x86-specific) - PATH+=':/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/' + if is_windows_64bit ; then + # path to WinDBG cdb (fixme: 64bit x86-specific) + PATH+=':/cygdrive/c/Program Files (x86)/Windows Kits/10/Debuggers/x64/' + + # PATH to DrMemory + PATH+=':/cygdrive/c/Program Files (x86)/Dr. Memory/bin/' + else + # path to WinDBG cdb (fixme: 64bit x86-specific) + PATH+=':/cygdrive/c/Program Files/Windows Kits/10/Debuggers/x86/' + + # PATH to DrMemory + PATH+=':/cygdrive/c/Program Files/Dr. Memory/bin' + fi # PATH to VSDiagnostics.exe and AgentConfigs vsdiagnostics_path='/cygdrive/c/Program Files (x86)/Microsoft Visual Studio/2019/Community/Team Tools/DiagnosticsHub/Collector/' PATH+=":${vsdiagnostics_path}" - # PATH to DrMemory - PATH+=':/cygdrive/c/Program Files (x86)/Dr. Memory/bin/' - # my own path to pstools PATH+=':/home/roland_mainz/work/win_pstools/' -- 2.45.1

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever

All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at