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 NFSv4.2 MinorProtocolversion in FileRemoteProtocolInfo+winfsinfo support for FileRemoteProtocolInfo, 2025-02-11
Posted by Anonymous on Tue 11th Feb 2025 01:51
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 8187c3749c8875e43bc6b8ae0d50283f590273aa Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 11 Feb 2025 02:11:02 +0100 Subject: [PATCH 1/2] daemon,include,sys: QueryInfo FileRemoteProtocolInformation should show the correct NFSv4.x minor version QueryInfo FileRemoteProtocolInformation should show the correct NFSv4.x minor version in the |FILE_REMOTE_PROTOCOL_INFORMATION.ProtocolMinorVersion| field (e.g. |2| for NFSv4.2 and |1| for NFSv4.1). Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/fileinfoutil.c | 24 ++++++++++++++++++++++++ daemon/getattr.c | 20 +++++++++++++++++++- daemon/upcall.h | 4 +++- daemon/util.h | 7 ++++++- include/from_kernel.h | 39 ++++++++++++++++++++++++++++++++++++++- sys/nfs41sys_fileinfo.c | 35 +++-------------------------------- 6 files changed, 93 insertions(+), 36 deletions(-) diff --git a/daemon/fileinfoutil.c b/daemon/fileinfoutil.c index 93fbde5..97eff4f 100644 --- a/daemon/fileinfoutil.c +++ b/daemon/fileinfoutil.c @@ -200,6 +200,30 @@ void nfs_to_network_openinfo( nfs_file_info_to_attributes(superblock, info); } +void nfs_to_remote_protocol_info( + IN nfs41_open_state *state, + OUT PFILE_REMOTE_PROTOCOL_INFORMATION restrict rpi_out) +{ + (void)memset(rpi_out, 0, sizeof(FILE_REMOTE_PROTOCOL_INFORMATION)); + + rpi_out->StructureVersion = 1; + rpi_out->StructureSize = sizeof(FILE_REMOTE_PROTOCOL_INFORMATION); + rpi_out->Protocol = WNNC_NET_RDR2SAMPLE; /* FIXME! */ + + /* ToDo: Add pNFS info */ + rpi_out->ProtocolMajorVersion = 4; + rpi_out->ProtocolMinorVersion = + (USHORT)state->session->client->root->nfsminorvers; + rpi_out->ProtocolRevision = 0; + + /* + * FIXME: |FILE_REMOTE_PROTOCOL_INFORMATION.Flags| should contain + * |REMOTE_PROTOCOL_FLAG_PRIVACY| (krb5p) and + * |REMOTE_PROTOCOL_FLAG_INTEGRITY| (krb5i) in case of Krb5 auth + */ + rpi_out->Flags = 0; +} + #ifdef NFS41_DRIVER_WSL_SUPPORT void nfs_to_stat_info( IN const char *restrict name, diff --git a/daemon/getattr.c b/daemon/getattr.c index 9be46be..17238a5 100644 --- a/daemon/getattr.c +++ b/daemon/getattr.c @@ -1,5 +1,6 @@ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> @@ -209,6 +210,15 @@ static int handle_getattr(void *daemon_context, nfs41_upcall *upcall) &info, &args->network_info); break; + case FileRemoteProtocolInformation: + /* + * |FileRemoteProtocolInformation| does not use |info|, but + * we have to do the |nfs41_cached_getattr()| anyway to fill + * out |info.change| to return the proper |args->ctime| + */ + nfs_to_remote_protocol_info(state, + &args->remote_protocol_info); + break; #ifdef NFS41_DRIVER_WSL_SUPPORT case FileStatInformation: nfs_to_stat_info(state->file.name.name, @@ -278,6 +288,14 @@ static int marshall_getattr(unsigned char *buffer, uint32_t *length, nfs41_upcal status = safe_write(&buffer, length, &args->network_info, info_len); if (status) goto out; break; + case FileRemoteProtocolInformation: + info_len = sizeof(args->remote_protocol_info); + status = safe_write(&buffer, length, &info_len, sizeof(info_len)); + if (status) goto out; + status = safe_write(&buffer, length, + &args->remote_protocol_info, info_len); + if (status) goto out; + break; #ifdef NFS41_DRIVER_WSL_SUPPORT case FileStatInformation: info_len = sizeof(args->stat_info); diff --git a/daemon/upcall.h b/daemon/upcall.h index 26878f1..59ad8ea 100644 --- a/daemon/upcall.h +++ b/daemon/upcall.h @@ -1,5 +1,6 @@ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> @@ -105,6 +106,7 @@ typedef struct __getattr_upcall_args { FILE_ATTRIBUTE_TAG_INFO tag_info; FILE_INTERNAL_INFORMATION intr_info; FILE_NETWORK_OPEN_INFORMATION network_info; + FILE_REMOTE_PROTOCOL_INFORMATION remote_protocol_info; #ifdef NFS41_DRIVER_WSL_SUPPORT FILE_STAT_INFORMATION stat_info; FILE_STAT_LX_INFORMATION stat_lx_info; diff --git a/daemon/util.h b/daemon/util.h index 3325a3a..05ea0d8 100644 --- a/daemon/util.h +++ b/daemon/util.h @@ -1,5 +1,6 @@ /* NFSv4.1 client for Windows - * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2012 The Regents of the University of Michigan + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> @@ -192,6 +193,10 @@ void nfs_to_network_openinfo( IN const nfs41_superblock *restrict superblock, IN const nfs41_file_info *restrict info, OUT PFILE_NETWORK_OPEN_INFORMATION restrict std_out); +typedef struct __nfs41_open_state nfs41_open_state; +void nfs_to_remote_protocol_info( + IN nfs41_open_state *state, + OUT PFILE_REMOTE_PROTOCOL_INFORMATION restrict rpi_out); #ifdef NFS41_DRIVER_WSL_SUPPORT void nfs_to_stat_info( IN const char *restrict name, diff --git a/include/from_kernel.h b/include/from_kernel.h index c750239..85cacce 100644 --- a/include/from_kernel.h +++ b/include/from_kernel.h @@ -1,6 +1,6 @@ /* NFSv4.1 client for Windows * Copyright (C) 2012 The Regents of the University of Michigan - * Copyright (C) 2023-2024 Roland Mainz <roland.mainz@nrubsig.org> + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> @@ -252,6 +252,43 @@ typedef struct _FILE_NETWORK_OPEN_INFORMATION { ULONG FileAttributes; } FILE_NETWORK_OPEN_INFORMATION, *PFILE_NETWORK_OPEN_INFORMATION; +#define REMOTE_PROTOCOL_FLAG_LOOPBACK 0x00000001 +#define REMOTE_PROTOCOL_FLAG_OFFLINE 0x00000002 +#define REMOTE_PROTOCOL_FLAG_PERSISTENT_HANDLE 0x00000004 +#define REMOTE_PROTOCOL_FLAG_PRIVACY 0x00000008 +#define REMOTE_PROTOCOL_FLAG_INTEGRITY 0x00000010 +#define REMOTE_PROTOCOL_FLAG_MUTUAL_AUTH 0x00000020 + +/* + * Note: |struct _FILE_REMOTE_PROTOCOL_INFORMATION| must be identical + * to the Win32 |struct FILE_REMOTE_PROTOCOL_INFO| + */ +typedef struct _FILE_REMOTE_PROTOCOL_INFORMATION +{ + USHORT StructureVersion; + USHORT StructureSize; + ULONG Protocol; /* |WNNC_NET_*| defines */ + USHORT ProtocolMajorVersion; + USHORT ProtocolMinorVersion; + USHORT ProtocolRevision; + USHORT Reserved; + ULONG Flags; + + struct { + ULONG Reserved[8]; + } GenericReserved; + +#if (_WIN32_WINNT < _WIN32_WINNT_WIN8) + struct { + ULONG Reserved[16]; + } ProtocolSpecificReserved; +#else + union { + ULONG Reserved[16]; + } ProtocolSpecific; +#endif /* (_WIN32_WINNT < _WIN32_WINNT_WIN8) */ +} FILE_REMOTE_PROTOCOL_INFORMATION, *PFILE_REMOTE_PROTOCOL_INFORMATION; + #ifndef LX_FILE_METADATA_HAS_UID typedef struct _FILE_STAT_INFORMATION { LARGE_INTEGER FileId; diff --git a/sys/nfs41sys_fileinfo.c b/sys/nfs41sys_fileinfo.c index dae459d..f6457e5 100644 --- a/sys/nfs41sys_fileinfo.c +++ b/sys/nfs41sys_fileinfo.c @@ -1,6 +1,6 @@ /* NFSv4.1 client for Windows * Copyright (C) 2012 The Regents of the University of Michigan - * Copyright (C) 2023-2024 Roland Mainz <roland.mainz@nrubsig.org> + * Copyright (C) 2023-2025 Roland Mainz <roland.mainz@nrubsig.org> * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> @@ -237,37 +237,6 @@ NTSTATUS nfs41_QueryFileInformation( status = STATUS_SUCCESS; goto out; } - case FileRemoteProtocolInformation: - { - if (RxContext->Info.LengthRemaining < - sizeof(FILE_REMOTE_PROTOCOL_INFORMATION)) { - print_error("nfs41_QueryFileInformation: " - "FILE_REMOTE_PROTOCOL_INFORMATION buffer too small\n"); - status = STATUS_BUFFER_TOO_SMALL; - goto out; - } - - PFILE_REMOTE_PROTOCOL_INFORMATION info = - (PFILE_REMOTE_PROTOCOL_INFORMATION)RxContext->Info.Buffer; - - (void)RtlZeroMemory(info, - sizeof(FILE_REMOTE_PROTOCOL_INFORMATION)); - info->StructureVersion = 1; - info->StructureSize = sizeof(FILE_REMOTE_PROTOCOL_INFORMATION); - info->Protocol = WNNC_NET_RDR2SAMPLE; /* FIXME! */ - /* - * ToDo: If we add NFSv4.1/NFSv4.2 protocol negotiation, then - * we need to call the userland daemon to return the correct - * protocol minor version - */ - info->ProtocolMajorVersion = 4; - info->ProtocolMinorVersion = 1; - info->ProtocolRevision = 0; - RxContext->Info.LengthRemaining -= - sizeof(FILE_REMOTE_PROTOCOL_INFORMATION); - status = STATUS_SUCCESS; - goto out; - } case FileCaseSensitiveInformation: { if (RxContext->Info.LengthRemaining < @@ -306,6 +275,7 @@ NTSTATUS nfs41_QueryFileInformation( case FileInternalInformation: case FileAttributeTagInformation: case FileNetworkOpenInformation: + case FileRemoteProtocolInformation: #ifdef NFS41_DRIVER_WSL_SUPPORT case FileStatInformation: case FileStatLxInformation: @@ -401,6 +371,7 @@ NTSTATUS nfs41_QueryFileInformation( #endif break; case FileNetworkOpenInformation: + case FileRemoteProtocolInformation: case FileInternalInformation: case FileAttributeTagInformation: #ifdef NFS41_DRIVER_WSL_SUPPORT -- 2.45.1 From 5f3ea20553caa20e6d9111081630aa23869ee4e2 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Tue, 11 Feb 2025 02:16:04 +0100 Subject: [PATCH 2/2] tests: winfsinfo: Add support for QueryInfo FileRemoteProtocolInformation winfsinfo: Add support for QueryInfo FileRemoteProtocolInformation Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- tests/winfsinfo1/winfsinfo.c | 124 ++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/tests/winfsinfo1/winfsinfo.c b/tests/winfsinfo1/winfsinfo.c index e9c098f..3a6c26a 100644 --- a/tests/winfsinfo1/winfsinfo.c +++ b/tests/winfsinfo1/winfsinfo.c @@ -851,6 +851,124 @@ done: return res; } +static +bool get_file_remote_protocol_info(const char *progname, const char *filename) +{ + int res = EXIT_FAILURE; + bool ok; + FILE_REMOTE_PROTOCOL_INFO frpi; + int i; + (void)memset(&frpi, 0, sizeof(frpi)); + + HANDLE fileHandle = CreateFileA(filename, + GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, + FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (fileHandle == INVALID_HANDLE_VALUE) { + (void)fprintf(stderr, + "%s: Error opening file '%s'. Last error was %d.\n", + progname, + filename, + (int)GetLastError()); + return EXIT_FAILURE; + } + + ok = GetFileInformationByHandleEx(fileHandle, + FileRemoteProtocolInfo, &frpi, sizeof(frpi)); + + if (!ok) { + (void)fprintf(stderr, "%s: GetFileInformationByHandleEx() " + "error. GetLastError()==%d.\n", + progname, + (int)GetLastError()); + res = EXIT_FAILURE; + goto done; + } + + (void)printf("(\n"); + (void)printf("\tfilename='%s'\n", filename); + + (void)printf("\tStructureVersion=%u\n", + (unsigned int)frpi.StructureVersion); + (void)printf("\tStructureSize=%u\n", + (unsigned int)frpi.StructureSize); + (void)printf("\tProtocol=%ld\n", + (long)frpi.Protocol); + (void)printf("\tProtocolMajorVersion=%u\n", + (unsigned int)frpi.ProtocolMajorVersion); + (void)printf("\tProtocolMinorVersion=%u\n", + (unsigned int)frpi.ProtocolMinorVersion); + (void)printf("\tProtocolRevision=%u\n", + (unsigned int)frpi.ProtocolRevision); + (void)printf("\tReserved=0x%x\n", + (unsigned int)frpi.Reserved); + + (void)printf("\ttypeset -a Flags=(\n"); + +#define TESTREMOTEPROTOCOLFLAG(s) \ + if (frpi.Flags & (s)) { \ + (void)puts("\t\t"#s); \ + frpi.Flags &= ~(s); \ + } + + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_LOOPBACK); + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_OFFLINE); + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_PERSISTENT_HANDLE); + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_PRIVACY); + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_INTEGRITY); + TESTREMOTEPROTOCOLFLAG(REMOTE_PROTOCOL_FLAG_MUTUAL_AUTH); + + (void)printf("\t)\n"); + + /* + * print any leftover flags not covered by + * |TESTREMOTEPROTOCOLFLAG()| above + */ + if (frpi.Flags) { + (void)printf("\tattr=0x%lx\n", (long)frpi.Flags); + } + + /* GenericReserved */ + (void)printf("\tcompound GenericReserved=(\n"); + (void)printf("\t\ttypeset -a Reserved=(\n"); + for (i=0 ; i < 8 ; i++) { + (void)printf("\t\t\t[%d]=%lx\n", + i, + (long)frpi.GenericReserved.Reserved[i]); + } + (void)printf("\t\t)\n"); + (void)printf("\t)\n"); + +#if (_WIN32_WINNT < _WIN32_WINNT_WIN8) + /* ProtocolSpecificReserved */ + (void)printf("\tcompound ProtocolSpecificReserved=(\n"); + (void)printf("\t\ttypeset -a Reserved=(\n"); + for (i=0 ; i < 16 ; i++) { + (void)printf("\t\t\t[%d]=%lx\n", + i, + (long)frpi.ProtocolSpecificReserved.Reserved[i]); + } + (void)printf("\t\t)\n"); + (void)printf("\t)\n"); +#else + /* ProtocolSpecific */ + (void)printf("\tcompound ProtocolSpecific=(\n"); + (void)printf("\t\ttypeset -a Reserved=(\n"); + for (i=0 ; i < 16 ; i++) { + (void)printf("\t\t\t[%d]=%lx\n", + i, + (long)frpi.ProtocolSpecific.Reserved[i]); + } + (void)printf("\t\t)\n"); + (void)printf("\t)\n"); +#endif /* (_WIN32_WINNT < _WIN32_WINNT_WIN8) */ + (void)printf(")\n"); + res = EXIT_SUCCESS; + +done: + (void)CloseHandle(fileHandle); + return res; +} + static void usage(void) { @@ -866,7 +984,8 @@ void usage(void) "filenormalizednameinfo|" "filecasesensitiveinfo|" "getfiletime|" - "nfs3attr" + "nfs3attr|" + "fileremoteprotocolinfo" "> path\n"); } @@ -913,6 +1032,9 @@ int main(int ac, char *av[]) else if (!strcmp(subcmd, "nfs3attr")) { return get_nfs3attr(av[0], av[2]); } + else if (!strcmp(subcmd, "fileremoteprotocolinfo")) { + return get_file_remote_protocol_info(av[0], av[2]); + } else { (void)fprintf(stderr, "%s: Unknown subcmd '%s'\n", av[0], subcmd); return EXIT_FAILURE; -- 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