rovema.kpaste.net RSS- diff --git a/daemon/mount.c b/daemon/mount.c
- index 55345f6..6489558 100644
- --- a/daemon/mount.c
- +++ b/daemon/mount.c
- @@ -37,6 +37,8 @@ static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upc
- status = get_name(&buffer, &length, &args->hostname);
- if(status) goto out;
- + status = safe_read(&buffer, &length, &args->port, sizeof(DWORD));
- + if (status) goto out;
- status = get_name(&buffer, &length, &args->path);
- if(status) goto out;
- status = safe_read(&buffer, &length, &args->sec_flavor, sizeof(DWORD));
- @@ -46,8 +48,8 @@ static int parse_mount(unsigned char *buffer, uint32_t length, nfs41_upcall *upc
- status = safe_read(&buffer, &length, &args->wsize, sizeof(DWORD));
- if (status) goto out;
- - dprintf(1, "parsing NFS14_MOUNT: srv_name=%s root=%s sec_flavor=%s "
- - "rsize=%d wsize=%d\n", args->hostname, args->path,
- + dprintf(1, "parsing NFS14_MOUNT: srv_name=%s port=%d root=%s sec_flavor=%s "
- + "rsize=%d wsize=%d\n", args->hostname, args->port, args->path,
- secflavorop2name(args->sec_flavor), args->rsize, args->wsize);
- out:
- return status;
- @@ -64,7 +66,7 @@ static int handle_mount(nfs41_upcall *upcall)
- nfs41_path_fh file;
- // resolve hostname,port
- - status = nfs41_server_resolve(args->hostname, 2049, &addrs);
- + status = nfs41_server_resolve(args->hostname, args->port, &addrs);
- if (status) {
- eprintf("nfs41_server_resolve() failed with %d\n", status);
- goto out;
- diff --git a/daemon/upcall.h b/daemon/upcall.h
- index fd26353..f9cb95e 100644
- --- a/daemon/upcall.h
- +++ b/daemon/upcall.h
- @@ -30,6 +30,7 @@
- /* structures for upcall arguments */
- typedef struct __mount_upcall_args {
- const char *hostname;
- + DWORD port;
- const char *path;
- DWORD sec_flavor;
- DWORD rsize;
- diff --git a/mount/mount.c b/mount/mount.c
- index 4615fc9..929a90d 100644
- --- a/mount/mount.c
- +++ b/mount/mount.c
- @@ -61,6 +61,7 @@ static VOID PrintUsage(LPTSTR pProcess)
- TEXT("\t-o <comma-separated mount options>\n")
- TEXT("Mount options:\n")
- TEXT("\tro\tmount as read-only\n")
- + TEXT("\tport=#\tTCP port for NFS (defaults to 2049)\n")
- TEXT("\trsize=#\tread buffer size in bytes\n")
- TEXT("\twsize=#\twrite buffer size in bytes\n")
- TEXT("\tsec=krb5:krb5i:krb5p\tspecify gss security flavor\n")
- diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c
- index 187894d..cb96009 100644
- --- a/sys/nfs41_driver.c
- +++ b/sys/nfs41_driver.c
- @@ -328,6 +328,7 @@ typedef struct _NFS41_MOUNT_CONFIG {
- BOOLEAN nocache;
- WCHAR srv_buffer[SERVER_NAME_BUFFER_SIZE];
- UNICODE_STRING SrvName;
- + DWORD Port;
- WCHAR mntpt_buffer[MAX_PATH];
- UNICODE_STRING MntPt;
- WCHAR sec_flavor[MAX_SEC_FLAVOR_LEN];
- @@ -2566,14 +2567,15 @@ NTSTATUS nfs41_mount(
- #ifdef DEBUG_MOUNT
- DbgEn();
- - DbgP("Server Name %wZ Mount Point %wZ SecFlavor %d\n",
- - &config->SrvName, &config->MntPt, sec_flavor);
- + DbgP("Server Name %wZ Port %d Mount Point %wZ SecFlavor %d\n",
- + &config->SrvName, &config->Port, &config->MntPt, sec_flavor);
- #endif
- status = nfs41_UpcallCreate(NFS41_MOUNT, NULL, *session,
- INVALID_HANDLE_VALUE, *version, &config->MntPt, &entry);
- if (status) goto out;
- entry->u.Mount.srv_name = &config->SrvName;
- + entry->u.Mount.port = config->Port;
- entry->u.Mount.root = &config->MntPt;
- entry->u.Mount.rsize = config->ReadSize;
- entry->u.Mount.wsize = config->WriteSize;
- @@ -2724,6 +2726,11 @@ NTSTATUS nfs41_MountConfig_ParseOptions(
- else
- RtlCopyUnicodeString(&Config->SrvName, &usValue);
- }
- + else if (wcsncmp(L"port", Name, NameLen) == 0) {
- + status = nfs41_MountConfig_ParseDword(Option, &usValue,
- + &Config->Port, 1,
- + 65535);
- + }
- else if (wcsncmp(L"mntpt", Name, NameLen) == 0) {
- if (usValue.Length > Config->MntPt.MaximumLength)
- status = STATUS_NAME_TOO_LONG;
ms-nfsv41-client "port" option prototype
Posted by Anonymous on Mon 4th Sep 2023 00:47
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.