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.

 

nfs_mount.exe -o port=... option prototype
Posted by Anonymous on Tue 19th Sep 2023 17:08
raw | new post
view followups (newest first): nfs_mount.exe -o port=... option prototype by Anonymous

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}
diff --git a/daemon/mount.c b/daemon/mount.c index 55345f6..50b986b 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,10 +48,12 @@ 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); + return status; out: + dprintf(1, "parsing NFS14_MOUNT: failed %d\n", status); return status; } @@ -64,7 +68,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, (unsigned short)args->port, &addrs); if (status) { eprintf("nfs41_server_resolve() failed with %d\n", status); goto out; @@ -76,7 +80,7 @@ static int handle_mount(nfs41_upcall *upcall) root = upcall->root_ref; } else { // create root - status = nfs41_root_create(args->hostname, args->sec_flavor, + status = nfs41_root_create(args->hostname, args->port, args->sec_flavor, args->wsize + WRITE_OVERHEAD, args->rsize + READ_OVERHEAD, &root); if (status) { eprintf("nfs41_root_create() failed %d\n", status); diff --git a/daemon/namespace.c b/daemon/namespace.c index ab16f49..11917e2 100644 --- a/daemon/namespace.c +++ b/daemon/namespace.c @@ -36,6 +36,7 @@ /* nfs41_root */ int nfs41_root_create( IN const char *name, + IN uint32_t port, IN uint32_t sec_flavor, IN uint32_t wsize, IN uint32_t rsize, @@ -44,7 +45,7 @@ int nfs41_root_create( int status = NO_ERROR; nfs41_root *root; - dprintf(NSLVL, "--> nfs41_root_create()\n"); + dprintf(NSLVL, "--> nfs41_root_create(name=%s, port=%d)\n", name, port); root = calloc(1, sizeof(nfs41_root)); if (root == NULL) { @@ -60,7 +61,7 @@ int nfs41_root_create( root->sec_flavor = sec_flavor; /* generate a unique client_owner */ - status = nfs41_client_owner(name, sec_flavor, &root->client_owner); + status = nfs41_client_owner(name, port, sec_flavor, &root->client_owner); if (status) { eprintf("nfs41_client_owner() failed with %d\n", status); free(root); @@ -443,6 +444,8 @@ static int referral_mount_location( int status = ERROR_BAD_NET_NAME; uint32_t i; + dprintf(NSLVL, "--> referral_mount_location()\n"); + /* create a client and session for the first available server */ for (i = 0; i < loc->server_count; i++) { /* XXX: only deals with 'address' as a hostname with default port */ @@ -453,6 +456,9 @@ static int referral_mount_location( if (status == NO_ERROR) break; } + + dprintf(NSLVL, "<-- referral_mount_location() returning %d\n", status); + return status; } diff --git a/daemon/nfs41.h b/daemon/nfs41.h index aa679a6..3902393 100644 --- a/daemon/nfs41.h +++ b/daemon/nfs41.h @@ -287,6 +287,7 @@ typedef struct __nfs41_root { /* nfs41_namespace.c */ int nfs41_root_create( IN const char *name, + IN uint32_t port, IN uint32_t sec_flavor, IN uint32_t wsize, IN uint32_t rsize, @@ -404,6 +405,7 @@ void nfs41_server_addrs( /* nfs41_client.c */ int nfs41_client_owner( IN const char *name, + IN uint32_t port, IN uint32_t sec_flavor, OUT client_owner4 *owner); diff --git a/daemon/nfs41_client.c b/daemon/nfs41_client.c index 0460fc5..01d19ac 100644 --- a/daemon/nfs41_client.c +++ b/daemon/nfs41_client.c @@ -353,6 +353,7 @@ out: int nfs41_client_owner( IN const char *name, + IN uint32_t port, IN uint32_t sec_flavor, OUT client_owner4 *owner) { diff --git a/daemon/nfs41_server.c b/daemon/nfs41_server.c index d58c03a..ef8f0ac 100644 --- a/daemon/nfs41_server.c +++ b/daemon/nfs41_server.c @@ -338,6 +338,6 @@ out: "error %d\n", hostname, port, status); else dprintf(SRVLVL, "<-- nfs41_server_resolve(%s:%u) returning " - "%s\n", hostname, port, addrs->arr[0].uaddr); + "OK %s\n", hostname, port, addrs->arr[0].uaddr); return status; } diff --git a/daemon/upcall.h b/daemon/upcall.h index fd26353..cf85598 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..6d8c8ee 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -61,13 +61,14 @@ 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 to use (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") TEXT("\twritethru\tturns off rdbss caching for writes\n") TEXT("\tnocache\tturns off rdbss caching\n") TEXT("\ttimeout=#\tspecify upcall timeout value in seconds (default 120s)\n"), - pProcess, pProcess, pProcess); + pProcess); } DWORD __cdecl _tmain(DWORD argc, LPTSTR argv[]) diff --git a/sys/nfs41_driver.c b/sys/nfs41_driver.c index da9327f..242b020 100644 --- a/sys/nfs41_driver.c +++ b/sys/nfs41_driver.c @@ -166,6 +166,7 @@ typedef struct _updowncall_entry { union { struct { PUNICODE_STRING srv_name; + DWORD port; PUNICODE_STRING root; PFILE_FS_ATTRIBUTE_INFORMATION FsAttrs; DWORD sec_flavor; @@ -314,6 +315,7 @@ DECLARE_CONST_UNICODE_STRING(SLASH, L"\\"); DECLARE_CONST_UNICODE_STRING(EMPTY_STRING, L""); #define SERVER_NAME_BUFFER_SIZE 1024 +#define MOUNT_CONFIG_NFS_PORT_DEFAULT 2049 #define MOUNT_CONFIG_RW_SIZE_MIN 1024 #define MOUNT_CONFIG_RW_SIZE_DEFAULT 1048576 #define MOUNT_CONFIG_RW_SIZE_MAX 1048576 @@ -328,6 +330,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]; @@ -615,13 +618,15 @@ NTSTATUS marshal_nfs41_mount( goto out; } header_len = *len + length_as_utf8(entry->u.Mount.srv_name) + - length_as_utf8(entry->u.Mount.root) + 3 * sizeof(DWORD); + length_as_utf8(entry->u.Mount.root) + 4 * sizeof(DWORD); if (header_len > buf_len) { status = STATUS_INSUFFICIENT_RESOURCES; goto out; } status = marshall_unicode_as_utf8(&tmp, entry->u.Mount.srv_name); if (status) goto out; + RtlCopyMemory(tmp, &entry->u.Mount.port, sizeof(DWORD)); + tmp += sizeof(DWORD); status = marshall_unicode_as_utf8(&tmp, entry->u.Mount.root); if (status) goto out; RtlCopyMemory(tmp, &entry->u.Mount.sec_flavor, sizeof(DWORD)); @@ -633,8 +638,9 @@ NTSTATUS marshal_nfs41_mount( *len = header_len; #ifdef DEBUG_MARSHAL_DETAIL - DbgP("marshal_nfs41_mount: server name=%wZ mount point=%wZ sec_flavor=%s " - "rsize=%d wsize=%d\n", entry->u.Mount.srv_name, entry->u.Mount.root, + DbgP("marshal_nfs41_mount: server name=%wZ port=%d mount point=%wZ " + "sec_flavor=%s rsize=%d wsize=%d\n", + entry->u.Mount.srv_name, entry->u.Mount.port, entry->u.Mount.root, secflavorop2name(entry->u.Mount.sec_flavor), entry->u.Mount.rsize, entry->u.Mount.wsize); #endif @@ -2574,6 +2580,7 @@ NTSTATUS nfs41_mount( 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; @@ -2606,6 +2613,7 @@ void nfs41_MountConfig_InitDefaults( { RtlZeroMemory(Config, sizeof(NFS41_MOUNT_CONFIG)); + Config->Port = MOUNT_CONFIG_NFS_PORT_DEFAULT; Config->ReadSize = MOUNT_CONFIG_RW_SIZE_DEFAULT; Config->WriteSize = MOUNT_CONFIG_RW_SIZE_DEFAULT; Config->ReadOnly = FALSE; @@ -2724,6 +2732,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;

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