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 libtirpc deadlocks and misc other things, 2023-10-28-001
Posted by Anonymous on Sat 28th Oct 2023 13:25
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 f5b931a4d923431115a0be7c579f36c708c78530 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Fri, 27 Oct 2023 15:04:13 +0200 Subject: [PATCH 1/6] libtirpc: Use fd number instead of SOCKET handle for locking libtirpc: Use fd number (from |_get_osfhandle()| instead of |SOCKET| handle for locking. The original Windows libtirpc implementation used a SOCKET handle and |WINSOCK_HANDLE_HASH(x) (((x) >> 2) % WINSOCK_HANDLE_HASH_SIZE)| to get an index to an array of |CONDITION_VARIABLE| to implement locking, while the POSIX implementation just used the |fd| value as index. But |SOCKET| can be a 64bit pointer, and the |%| causes wrapound and re-use of one |CONDITION_VARIABLE| variable for multiple threads - the symptoms are hangs under hightly parallel loads on multiple mounts. The patch now switches the code back to use a |fd| (obtained via |_open_osfhandle(sock, _O_BINARY)|, |_get_osfhandle(fd)| and our own |wintirpc_handle2fd(sock)|) as index. This is also preparation (mostly abstraction) so that we can update libtirpc to a newer version in the future. The patch also bumps |FD_SETSIZE| from |128| to |1024|. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- build.vc19/libtirpc/libtirpc.vcxproj | 8 +- libtirpc/src/auth_time.c | 26 ++--- libtirpc/src/bindresvport.c | 34 +++---- libtirpc/src/clnt_bcast.c | 33 ++++--- libtirpc/src/clnt_dg.c | 64 ++++++------ libtirpc/src/clnt_generic.c | 12 +-- libtirpc/src/clnt_vc.c | 66 ++++++------- libtirpc/src/getpeereid.c | 4 +- libtirpc/src/pmap_getmaps.c | 2 +- libtirpc/src/rpc_com.h | 4 +- libtirpc/src/rpc_generic.c | 25 ++--- libtirpc/src/rpc_soc.c | 42 ++++---- libtirpc/src/rpcb_clnt.c | 26 ++--- libtirpc/src/rtime.c | 21 ++-- libtirpc/src/svc.c | 14 +-- libtirpc/src/svc_dg.c | 10 +- libtirpc/src/svc_generic.c | 12 +-- libtirpc/src/svc_vc.c | 30 +++--- libtirpc/src/wintirpc.c | 140 ++++++++++++++++++++++++++- libtirpc/tirpc/getpeereid.h | 2 +- libtirpc/tirpc/rpc/clnt.h | 6 +- libtirpc/tirpc/rpc/clnt_soc.h | 2 +- libtirpc/tirpc/rpc/rpc.h | 8 +- libtirpc/tirpc/rpc/rpc_com.h | 2 +- libtirpc/tirpc/rpc/svc.h | 20 ++-- libtirpc/tirpc/wintirpc.h | 43 +++++--- 26 files changed, 406 insertions(+), 250 deletions(-) diff --git a/build.vc19/libtirpc/libtirpc.vcxproj b/build.vc19/libtirpc/libtirpc.vcxproj index 36b6c4f..0694ed6 100644 --- a/build.vc19/libtirpc/libtirpc.vcxproj +++ b/build.vc19/libtirpc/libtirpc.vcxproj @@ -87,7 +87,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>FD_SETSIZE=128;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -103,7 +103,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>FD_SETSIZE=128;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -121,7 +121,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>FD_SETSIZE=128;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> @@ -141,7 +141,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>FD_SETSIZE=128;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>FD_SETSIZE=1024;INET6;NO_CB_4_KRB5P;PORTMAP;_WINSOCK_DEPRECATED_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;LIBTIRPC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\libtirpc\tirpc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <Link> diff --git a/libtirpc/src/auth_time.c b/libtirpc/src/auth_time.c index ad8e521..acf5e0e 100644 --- a/libtirpc/src/auth_time.c +++ b/libtirpc/src/auth_time.c @@ -250,7 +250,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) nis_server tsrv; void (*oldsig)() = NULL; /* old alarm handler */ struct sockaddr_in sin; - SOCKET s = RPC_ANYSOCK; + int s = RPC_ANYSOCK; socklen_t len; int type = 0; @@ -377,8 +377,8 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) goto error; } - s = socket(AF_INET, type, 0); - if (s == INVALID_SOCKET) { + s = wintirpc_socket(AF_INET, type, 0); + if (s == -1) { msg("unable to open fd to network."); goto error; } @@ -393,22 +393,22 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) fd_set readfds; int res; - if (sendto(s, (const char *)&thetime, sizeof(thetime), 0, + if (wintirpc_sendto(s, (const char *)&thetime, sizeof(thetime), 0, (struct sockaddr *)&sin, sizeof(sin)) == -1) { msg("udp : sendto failed."); goto error; } do { FD_ZERO(&readfds); - FD_SET(s, &readfds); + FD_SET(_get_osfhandle(s), &readfds); res = select(_rpc_dtablesize(), &readfds, - (fd_set *)NULL, (fd_set *)NULL, &timeout); + (fd_set *)NULL, (fd_set *)NULL, &timeout); } while (res == SOCKET_ERROR && WSAGetLastError() == WSAEINTR); if (res == SOCKET_ERROR) goto error; len = sizeof(from); - res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, - (struct sockaddr *)&from, &len); + res = recvfrom(_get_osfhandle(s), (char *)&thetime, sizeof(thetime), 0, + (struct sockaddr *)&from, &len); if (res == SOCKET_ERROR) { msg("recvfrom failed on udp transport."); goto error; @@ -424,7 +424,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) saw_alarm = 0; /* XXX Need Windows signal/alarm stuff here XXX */ #endif - res = connect(s, (struct sockaddr *)&sin, sizeof(sin)); + res = connect(_get_osfhandle(s), (struct sockaddr *)&sin, sizeof(sin)); if (res == SOCKET_ERROR) { msg("failed to connect to tcp endpoint."); goto error; @@ -433,8 +433,8 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) msg("alarm caught it, must be unreachable."); goto error; } -// res = read(s, (char *)&thetime, sizeof(thetime)); - res = recv(s, (char *)&thetime, sizeof(thetime), 0); +// res = read(_get_osfhandle(s), (char *)&thetime, sizeof(thetime)); + res = recv(_get_osfhandle(s), (char *)&thetime, sizeof(thetime), 0); if (res != sizeof(thetime)) { if (saw_alarm) msg("timed out TCP call."); @@ -446,7 +446,7 @@ __rpc_get_time_offset(td, srv, thost, uaddr, netid) time_valid = 1; } save = WSAGetLastError(); - (void)closesocket(s); + (void)wintirpc_closesocket(s); errno = save; s = RPC_ANYSOCK; @@ -465,7 +465,7 @@ error: */ if (s != RPC_ANYSOCK) - (void)closesocket(s); + (void)wintirpc_closesocket(s); if (clnt != NULL) clnt_destroy(clnt); diff --git a/libtirpc/src/bindresvport.c b/libtirpc/src/bindresvport.c index c1f0d9b..fc325fc 100644 --- a/libtirpc/src/bindresvport.c +++ b/libtirpc/src/bindresvport.c @@ -51,10 +51,10 @@ */ int bindresvport(sd, sin) - SOCKET sd; - struct sockaddr_in *sin; + int sd; + struct sockaddr_in *sin; { - return bindresvport_sa(sd, (struct sockaddr *)sin); + return bindresvport_sa(sd, (struct sockaddr *)sin); } #ifdef __linux__ @@ -87,7 +87,7 @@ bindresvport_sa(sd, sa) salen = sizeof(myaddr); sa = (struct sockaddr *)&myaddr; - if (getsockname(sd, (struct sockaddr *)&myaddr, &salen) == -1) + if (getsockname(_get_osfhandle(sd), (struct sockaddr *)&myaddr, &salen) == -1) return -1; /* errno is correctly set */ af = myaddr.ss_family; @@ -125,7 +125,7 @@ bindresvport_sa(sd, sa) *portp = htons(port++); if (port > endport) port = startport; - res = bind(sd, sa, salen); + res = bind(_get_osfhandle(sd), sa, salen); if (res >= 0 || errno != EADDRINUSE) break; } @@ -144,7 +144,7 @@ bindresvport_sa(sd, sa) #if defined(_WIN32) int -bindresvport_sa(SOCKET sd, struct sockaddr *sa) +bindresvport_sa(int sd, struct sockaddr *sa) { fprintf(stderr, "Do-nothing bindresvport_sa!\n"); return 0; @@ -159,7 +159,7 @@ bindresvport_sa(SOCKET sd, struct sockaddr *sa) */ int bindresvport_sa(sd, sa) - SOCKET sd; + int sd; struct sockaddr *sa; { #ifdef IPV6_PORTRANGE @@ -185,13 +185,13 @@ bindresvport_sa(sd, sa) #ifdef _WIN32 memset(sa, 0, salen); - if (error = getsockopt(sd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { + if (error = getsockopt(_get_osfhandle(sd), SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { int sockerr = WSAGetLastError(); return -1; } af = proto_info.iAddressFamily; #else - if (getsockname(sd, sa, &salen) == -1) + if (getsockname(_get_osfhandle(sd), sa, &salen) == -1) return -1; /* errno is correctly set */ af = sa->sa_family; @@ -231,18 +231,18 @@ bindresvport_sa(sd, sa) if (*portp == 0) { socklen_t oldlen = sizeof(old); - error = getsockopt(sd, proto, portrange, &old, &oldlen); + error = getsockopt(_get_osfhandle(sd), proto, portrange, &old, &oldlen); if (error < 0) return (error); - error = setsockopt(sd, proto, portrange, &portlow, - sizeof(portlow)); + error = setsockopt(_get_osfhandle(sd), proto, portrange, &portlow, + sizeof(portlow)); if (error < 0) return (error); } #endif - error = bind(sd, sa, salen); + error = bind(_get_osfhandle(sd), sa, salen); if (error) { int err = WSAGetLastError(); } @@ -252,15 +252,15 @@ bindresvport_sa(sd, sa) int saved_errno = errno; if (error < 0) { - if (setsockopt(sd, proto, portrange, &old, - sizeof(old)) < 0) - errno = saved_errno; + if (setsockopt(_get_osfhandle(sd), proto, portrange, &old, + sizeof(old)) < 0) + errno = saved_errno; return (error); } if (sa != (struct sockaddr *)&myaddr) { /* Hmm, what did the kernel assign? */ - if (getsockname(sd, sa, &salen) < 0) + if (getsockname(_get_osfhandle(sd), sa, &salen) < 0) errno = saved_errno; return (error); } diff --git a/libtirpc/src/clnt_bcast.c b/libtirpc/src/clnt_bcast.c index 8d32c5d..89b7c7c 100644 --- a/libtirpc/src/clnt_bcast.c +++ b/libtirpc/src/clnt_bcast.c @@ -60,6 +60,7 @@ #endif /* PORTMAP */ #include <rpc/nettype.h> //#include <arpa/inet.h> +//#define RPC_DEBUG 1 #ifdef RPC_DEBUG #include <stdio.h> #endif @@ -248,12 +249,12 @@ __rpc_broadenable(int af, int s, struct broadif *bip) #if 0 if (af == AF_INET6) { fprintf(stderr, "set v6 multicast if to %d\n", bip->index); - if (setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &bip->index, - sizeof bip->index) < 0) + if (setsockopt(_get_osfhandle(s), IPPROTO_IPV6, IPV6_MULTICAST_IF, &bip->index, + sizeof bip->index) < 0) return -1; } else #endif - if (setsockopt(s, SOL_SOCKET, SO_BROADCAST, &o, sizeof o) == SOCKET_ERROR) + if (setsockopt(_get_osfhandle(s), SOL_SOCKET, SO_BROADCAST, &o, sizeof o) == SOCKET_ERROR) return -1; return 0; @@ -292,7 +293,8 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, int pmap_reply_flag; /* reply recvd from PORTMAP */ /* An array of all the suitable broadcast transports */ struct { - int fd; /* File descriptor */ + SOCK fd_sock; /* File descriptor */ + int fd; int af; int proto; struct netconfig *nconf; /* Netconfig structure */ @@ -349,22 +351,23 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, TAILQ_INIT(&fdlist[fdlistno].nal); if (__rpc_getbroadifs(si.si_af, si.si_proto, si.si_socktype, - &fdlist[fdlistno].nal) == 0) + &fdlist[fdlistno].nal) == 0) continue; - fd = socket(si.si_af, si.si_socktype, si.si_proto); + fd = wintirpc_socket(si.si_af, si.si_socktype, si.si_proto); if (fd == INVALID_SOCKET) { stat = RPC_CANTSEND; continue; } fdlist[fdlistno].af = si.si_af; fdlist[fdlistno].proto = si.si_proto; + fdlist[fdlistno].fd_sock = _get_osfhandle(fd); fdlist[fdlistno].fd = fd; fdlist[fdlistno].nconf = nconf; fdlist[fdlistno].asize = __rpc_get_a_size(si.si_af); pfd[fdlistno].events = POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND; - pfd[fdlistno].fd = fdlist[fdlistno].fd = fd; + pfd[fdlistno].fd = fdlist[fdlistno].fd_sock = _get_osfhandle(fd); fdlist[fdlistno].dsize = __rpc_get_t_size(si.si_af, si.si_proto, 0); @@ -375,7 +378,7 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) { udpbufsz = fdlist[fdlistno].dsize; if ((outbuf_pmap = malloc(udpbufsz)) == NULL) { - closesocket(fd); + wintirpc_closesocket(fd); stat = RPC_SYSTEMERROR; goto done_broad; } @@ -486,10 +489,10 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, */ if (!__rpc_lowvers) - if (sendto(fdlist[i].fd, outbuf, - outlen, 0, (struct sockaddr*)addr, - (size_t)fdlist[i].asize) != - outlen) { + if (wintirpc_sendto(fdlist[i].fd, outbuf, + outlen, 0, (struct sockaddr*)addr, + (size_t)fdlist[i].asize) != + outlen) { #ifdef RPC_DEBUG perror("sendto"); #endif @@ -511,7 +514,7 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, */ if (pmap_flag && fdlist[i].proto == IPPROTO_UDP) { - if (sendto(fdlist[i].fd, outbuf_pmap, + if (wintirpc_sendto(fdlist[i].fd, outbuf_pmap, outlen_pmap, 0, addr, (size_t)fdlist[i].asize) != outlen_pmap) { @@ -573,7 +576,7 @@ rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp, fdlist[i].nconf->nc_netid); #endif try_again: - inlen = recvfrom(fdlist[i].fd, inbuf, fdlist[i].dsize, + inlen = recvfrom(fdlist[i].fd_sock, inbuf, fdlist[i].dsize, 0, (struct sockaddr *)(void *)&fdlist[i].raddr, &fdlist[i].asize); if (inlen < 0) { @@ -673,7 +676,7 @@ done_broad: (void) free(outbuf_pmap); #endif /* PORTMAP */ for (i = 0; i < fdlistno; i++) { - (void)closesocket(fdlist[i].fd); + (void)wintirpc_closesocket(fdlist[i].fd); __rpc_freebroadifs(&fdlist[i].nal); } AUTH_DESTROY(sys_auth); diff --git a/libtirpc/src/clnt_dg.c b/libtirpc/src/clnt_dg.c index 1ece8ad..529a401 100644 --- a/libtirpc/src/clnt_dg.c +++ b/libtirpc/src/clnt_dg.c @@ -98,19 +98,19 @@ static cond_t *dg_cv; #ifndef _WIN32 #define release_fd_lock(fd, mask) { \ mutex_lock(&clnt_fd_lock); \ - dg_fd_locks[fd] = 0; \ + dg_fd_locks[(fd)] = 0; \ mutex_unlock(&clnt_fd_lock); \ thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \ - cond_signal(&dg_cv[fd]); \ + cond_signal(&dg_cv[(fd)]); \ } #else /* XXX Needs Windows signal/event stuff XXX */ #define release_fd_lock(fd, mask) { \ mutex_lock(&clnt_fd_lock); \ - dg_fd_locks[WINSOCK_HANDLE_HASH(fd)] = 0; \ + dg_fd_locks[(fd)] = 0; \ mutex_unlock(&clnt_fd_lock); \ \ - cond_signal(&dg_cv[WINSOCK_HANDLE_HASH(fd)]); \ + cond_signal(&dg_cv[(fd)]); \ } #endif @@ -122,7 +122,7 @@ static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory"; * Private data kept per client handle */ struct cu_data { - SOCKET cu_fd; /* connections fd */ + int cu_fd; /* connections fd */ bool_t cu_closeit; /* opened by library */ struct sockaddr_storage cu_raddr; /* remote address */ int cu_rlen; @@ -156,7 +156,7 @@ struct cu_data { */ CLIENT * clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz) - SOCKET fd; /* open file descriptor */ + int fd; /* open file descriptor */ const struct netbuf *svcaddr; /* servers address */ rpcprog_t program; /* program number */ rpcvers_t version; /* version number */ @@ -281,10 +281,10 @@ clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz) #ifdef IP_RECVERR { int on = 1; - setsockopt(fd, SOL_IP, IP_RECVERR, &on, sizeof(on)); + setsockopt(_get_osfhandle(fd), SOL_IP, IP_RECVERR, &on, sizeof(on)); } #endif - ioctlsocket(fd, FIONBIO, &one); + ioctlsocket(_get_osfhandle(fd), FIONBIO, &one); /* * By default, closeit is always FALSE. It is users responsibility * to do a close on it, else the user may use clnt_control @@ -330,7 +330,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout) bool_t ok; int nrefreshes = 2; /* number of times to refresh cred */ struct timeval timeout; - struct pollfd fd; + struct pollfd fd; int total_time, nextsend_time, tv=0; struct sockaddr *sa; #ifndef _WIN32 @@ -352,10 +352,10 @@ clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout) /* XXX Need Windows signal/event stuff here XXX */ #endif mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[WINSOCK_HANDLE_HASH(cu->cu_fd)]) - cond_wait(&dg_cv[WINSOCK_HANDLE_HASH(cu->cu_fd)], &clnt_fd_lock); + while (dg_fd_locks[cu->cu_fd]) + cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); rpc_lock_value = 1; - dg_fd_locks[WINSOCK_HANDLE_HASH(cu->cu_fd)] = rpc_lock_value; + dg_fd_locks[cu->cu_fd] = rpc_lock_value; mutex_unlock(&clnt_fd_lock); if (cu->cu_total.tv_usec == -1) { timeout = utimeout; /* use supplied timeout */ @@ -366,7 +366,7 @@ clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout) nextsend_time = cu->cu_wait.tv_sec * 1000 + cu->cu_wait.tv_usec / 1000; if (cu->cu_connect && !cu->cu_connected) { - if (connect(cu->cu_fd, (struct sockaddr *)&cu->cu_raddr, + if (connect(_get_osfhandle(cu->cu_fd), (struct sockaddr *)&cu->cu_raddr, cu->cu_rlen) < 0) { cu->cu_error.re_errno = errno; cu->cu_error.re_status = RPC_CANTSEND; @@ -420,7 +420,7 @@ send_again: goto out; } nextsend_time = cu->cu_wait.tv_sec * 1000 + cu->cu_wait.tv_usec / 1000; - if (sendto(cu->cu_fd, cu->cu_outbuf, (int)outlen, 0, sa, salen) != outlen) { + if (wintirpc_sendto(cu->cu_fd, cu->cu_outbuf, (int)outlen, 0, sa, salen) != outlen) { cu->cu_error.re_errno = errno; cu->cu_error.re_status = RPC_CANTSEND; goto out; @@ -437,9 +437,9 @@ get_reply: reply_msg.acpted_rply.ar_results.where = resultsp; reply_msg.acpted_rply.ar_results.proc = xresults; - fd.fd = cu->cu_fd; - fd.events = POLLIN; - fd.revents = 0; + fd.fd = _get_osfhandle(cu->cu_fd); + fd.events = POLLIN; + fd.revents = 0; while (total_time > 0) { tv = total_time < nextsend_time ? total_time : nextsend_time; switch (poll(&fd, 1, tv)) { @@ -477,7 +477,7 @@ get_reply: msg.msg_flags = 0; msg.msg_control = cbuf; msg.msg_controllen = 256; - ret = recvmsg (cu->cu_fd, &msg, MSG_ERRQUEUE); + ret = recvmsg (_get_osfhandle(cu->cu_fd), &msg, MSG_ERRQUEUE); if (ret >= 0 && memcmp (cbuf + 256, cu->cu_outbuf, ret) == 0 && (msg.msg_flags & MSG_ERRQUEUE) @@ -502,7 +502,7 @@ get_reply: /* We have some data now */ do { - recvlen = recvfrom(cu->cu_fd, cu->cu_inbuf, + recvlen = recvfrom(_get_osfhandle(cu->cu_fd), cu->cu_inbuf, cu->cu_recvsz, 0, NULL, NULL); errno = WSAGetLastError(); } while (recvlen == SOCKET_ERROR && errno == WSAEINTR); @@ -606,13 +606,13 @@ clnt_dg_freeres(cl, xdr_res, res_ptr) /* XXX Need Windows signal/event stuff here XXX */ #endif mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[WINSOCK_HANDLE_HASH(cu->cu_fd)]) - cond_wait(&dg_cv[WINSOCK_HANDLE_HASH(cu->cu_fd)], &clnt_fd_lock); + while (dg_fd_locks[cu->cu_fd]) + cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); mutex_unlock(&clnt_fd_lock); // thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[WINSOCK_HANDLE_HASH(cu->cu_fd)]); + cond_signal(&dg_cv[cu->cu_fd]); return (dummy); } @@ -646,10 +646,10 @@ clnt_dg_control(cl, request, info) /* XXX Need Windows signal/event stuff here XXX */ #endif mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[WINSOCK_HANDLE_HASH(cu->cu_fd)]) - cond_wait(&dg_cv[WINSOCK_HANDLE_HASH(cu->cu_fd)], &clnt_fd_lock); - rpc_lock_value = 1; - dg_fd_locks[WINSOCK_HANDLE_HASH(cu->cu_fd)] = rpc_lock_value; + while (dg_fd_locks[cu->cu_fd]) + cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock); + rpc_lock_value = 1; + dg_fd_locks[cu->cu_fd] = rpc_lock_value; mutex_unlock(&clnt_fd_lock); switch (request) { case CLSET_FD_CLOSE: @@ -693,7 +693,7 @@ clnt_dg_control(cl, request, info) *(struct timeval *)info = cu->cu_wait; break; case CLGET_FD: - *(SOCKET *)info = cu->cu_fd; + *(int *)info = cu->cu_fd; break; case CLGET_SVC_ADDR: addr = (struct netbuf *)info; @@ -779,7 +779,7 @@ clnt_dg_destroy(cl) CLIENT *cl; { struct cu_data *cu = (struct cu_data *)cl->cl_private; - SOCKET cu_fd = cu->cu_fd; + int cu_fd = cu->cu_fd; #ifndef _WIN32 sigset_t mask; sigset_t newmask; @@ -790,10 +790,10 @@ clnt_dg_destroy(cl) /* XXX Need Windows signal/event stuff here XXX */ #endif mutex_lock(&clnt_fd_lock); - while (dg_fd_locks[WINSOCK_HANDLE_HASH(cu_fd)]) - cond_wait(&dg_cv[WINSOCK_HANDLE_HASH(cu_fd)], &clnt_fd_lock); + while (dg_fd_locks[cu_fd]) + cond_wait(&dg_cv[cu_fd], &clnt_fd_lock); if (cu->cu_closeit) - (void)closesocket(cu_fd); + (void)wintirpc_closesocket(cu_fd); XDR_DESTROY(&(cu->cu_outxdrs)); mem_free(cu, (sizeof (*cu) + cu->cu_sendsz + cu->cu_recvsz)); if (cl->cl_netid && cl->cl_netid[0]) @@ -803,7 +803,7 @@ clnt_dg_destroy(cl) mem_free(cl, sizeof (CLIENT)); mutex_unlock(&clnt_fd_lock); // thr_sigsetmask(SIG_SETMASK, &mask, NULL); - cond_signal(&dg_cv[WINSOCK_HANDLE_HASH(cu_fd)]); + cond_signal(&dg_cv[cu_fd]); } static struct clnt_ops * diff --git a/libtirpc/src/clnt_generic.c b/libtirpc/src/clnt_generic.c index 58a6cc1..f90c4b8 100644 --- a/libtirpc/src/clnt_generic.c +++ b/libtirpc/src/clnt_generic.c @@ -344,7 +344,7 @@ clnt_tp_create_timed(const char *hostname, const rpcprog_t prog, const rpcvers_t * If sizes are 0; appropriate defaults will be chosen. */ CLIENT * -clnt_tli_create(const SOCKET fd_in, const struct netconfig *nconf, +clnt_tli_create(const int fd_in, const struct netconfig *nconf, struct netbuf *svcaddr, const rpcprog_t prog, const rpcvers_t vers, const uint sendsz, const uint recvsz, int (*callback_xdr)(void *, void *), @@ -357,7 +357,7 @@ clnt_tli_create(const SOCKET fd_in, const struct netconfig *nconf, BOOL one = TRUE; struct __rpc_sockinfo si; extern int __rpc_minfd; - SOCKET fd = fd_in; + int fd = fd_in; if (fd == RPC_ANYFD) { if (nconf == NULL) { @@ -402,7 +402,7 @@ clnt_tli_create(const SOCKET fd_in, const struct netconfig *nconf, if (nconf && ((strcmp(nconf->nc_protofmly, "inet") == 0) || (strcmp(nconf->nc_protofmly, "inet6") == 0))) { - setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const char *)&one, + setsockopt(_get_osfhandle(fd), IPPROTO_TCP, TCP_NODELAY, (const char *)&one, sizeof (one)); } cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz, @@ -435,7 +435,7 @@ err: rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; err1: if (madefd) - (void)closesocket(fd); + (void)wintirpc_closesocket(fd); return (NULL); } @@ -460,11 +460,11 @@ __rpc_raise_fd(int fd) return (fd); if (fsync(nfd) == -1) { - closesocket(nfd); + wintirpc_closesocket(nfd); return (fd); } - if (closesocket(fd) == -1) { + if (wintirpc_closesocket(fd) == -1) { /* this is okay, we will syslog an error, then use the new fd */ (void) syslog(LOG_ERR, "could not close() fd %d; mem & fd leak", fd); diff --git a/libtirpc/src/clnt_vc.c b/libtirpc/src/clnt_vc.c index ff67d5c..e0a9d30 100644 --- a/libtirpc/src/clnt_vc.c +++ b/libtirpc/src/clnt_vc.c @@ -164,28 +164,27 @@ static cond_t *vc_cv; #ifndef _WIN32 #define release_fd_lock(fd, mask) { \ mutex_lock(&clnt_fd_lock); \ - vc_fd_locks[fd] = 0; \ + vc_fd_locks[(fd)] = 0; \ mutex_unlock(&clnt_fd_lock); \ thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL); \ - cond_signal(&vc_cv[fd]); \ + cond_signal(&vc_cv[(fd)]); \ } #else /* XXX Need Windows signal/event stuff XXX */ #define release_fd_lock(fd, mask) { \ mutex_lock(&clnt_fd_lock); \ - vc_fd_locks[WINSOCK_HANDLE_HASH(fd)] = 0; \ + vc_fd_locks[(fd)] = 0; \ mutex_unlock(&clnt_fd_lock); \ \ - cond_broadcast(&vc_cv[WINSOCK_HANDLE_HASH(fd)]); \ + cond_broadcast(&vc_cv[(fd)]); \ } #endif #define acquire_fd_lock(fd) { \ mutex_lock(&clnt_fd_lock); \ - while (vc_fd_locks[WINSOCK_HANDLE_HASH(fd)] && \ - vc_fd_locks[WINSOCK_HANDLE_HASH(fd)] != GetCurrentThreadId()) \ - cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(fd)], &clnt_fd_lock); \ - vc_fd_locks[WINSOCK_HANDLE_HASH(fd)] = GetCurrentThreadId(); \ + while (vc_fd_locks[(fd)]) \ + cond_wait(&vc_cv[(fd)], &clnt_fd_lock); \ + vc_fd_locks[(fd)] = GetCurrentThreadId(); \ mutex_unlock(&clnt_fd_lock); \ } @@ -213,18 +212,18 @@ static unsigned int WINAPI clnt_cb_thread(void *args) cb_req header; void *res = NULL; mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] || + while (vc_fd_locks[ct->ct_fd] || !ct->use_stored_reply_msg || (ct->use_stored_reply_msg && ct->reply_msg.rm_direction != CALL)) { if (cl->shutdown) break; - if (!cond_wait_timed(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)], &clnt_fd_lock, + if (!cond_wait_timed(&vc_cv[ct->ct_fd], &clnt_fd_lock, CALLBACK_TIMEOUT)) - if (!vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)]) + if (!vc_fd_locks[ct->ct_fd]) break; - } - vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] = GetCurrentThreadId(); - mutex_unlock(&clnt_fd_lock); + } + vc_fd_locks[ct->ct_fd] = GetCurrentThreadId(); + mutex_unlock(&clnt_fd_lock); if (cl->shutdown) { fprintf(stdout, "%04x: callback received shutdown signal\n", GetCurrentThreadId()); @@ -402,7 +401,7 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz, cb_xdr, cb_fn, cb_args) * XXX - fvdl connecting while holding a mutex? */ slen = sizeof ss; - if (getpeername(fd, (struct sockaddr *)&ss, &slen) == SOCKET_ERROR) { + if (getpeername(_get_osfhandle(fd), (struct sockaddr *)&ss, &slen) == SOCKET_ERROR) { errno = WSAGetLastError(); if (errno != WSAENOTCONN) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; @@ -411,7 +410,7 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz, cb_xdr, cb_fn, cb_args) // thr_sigsetmask(SIG_SETMASK, &(mask), NULL); goto err; } - if (connect(fd, (struct sockaddr *)raddr->buf, raddr->len) == SOCKET_ERROR){ + if (connect(_get_osfhandle(fd), (struct sockaddr *)raddr->buf, raddr->len) == SOCKET_ERROR){ rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = WSAGetLastError(); mutex_unlock(&clnt_fd_lock); @@ -457,7 +456,7 @@ clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz, cb_xdr, cb_fn, cb_args) XDR_ENCODE); if (! xdr_callhdr(&(ct->ct_xdrs), &call_msg)) { if (ct->ct_closeit) { - (void)closesocket(fd); + (void)wintirpc_closesocket(fd); } goto err; } @@ -589,11 +588,10 @@ call_again: #ifdef NO_CB_4_KRB5P if (cl->cb_thread != INVALID_HANDLE_VALUE) { mutex_lock(&clnt_fd_lock); - while ((vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] && - vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] != GetCurrentThreadId()) || + while ((vc_fd_locks[ct->ct_fd]) || (ct->reply_msg.rm_xid && ct->reply_msg.rm_xid != x_id)) - cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)], &clnt_fd_lock); - vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)] = GetCurrentThreadId(); + cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); + vc_fd_locks[ct->ct_fd] = GetCurrentThreadId(); mutex_unlock(&clnt_fd_lock); } #endif @@ -744,13 +742,13 @@ clnt_vc_freeres(cl, xdr_res, res_ptr) /* XXX Need Windows signal/event stuff XXX */ #endif mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[WINSOCK_HANDLE_HASH(ct->ct_fd)]) - cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)], &clnt_fd_lock); + while (vc_fd_locks[ct->ct_fd]) + cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock); xdrs->x_op = XDR_FREE; dummy = (*xdr_res)(xdrs, res_ptr); mutex_unlock(&clnt_fd_lock); // thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[WINSOCK_HANDLE_HASH(ct->ct_fd)]); + cond_signal(&vc_cv[ct->ct_fd]); return dummy; } @@ -916,8 +914,8 @@ clnt_vc_destroy(cl) /* XXX Need Windows signal/event stuff XXX */ #endif mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[WINSOCK_HANDLE_HASH(ct_fd)]) - cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct_fd)], &clnt_fd_lock); + while (vc_fd_locks[ct_fd]) + cond_wait(&vc_cv[ct_fd], &clnt_fd_lock); if (cl->cb_thread != INVALID_HANDLE_VALUE) { int status; @@ -925,16 +923,16 @@ clnt_vc_destroy(cl) GetCurrentThreadId(), cl->cb_thread); cl->shutdown = 1; mutex_unlock(&clnt_fd_lock); - cond_signal(&vc_cv[WINSOCK_HANDLE_HASH(ct_fd)]); + cond_signal(&vc_cv[ct_fd]); status = WaitForSingleObject(cl->cb_thread, INFINITE); fprintf(stdout, "%04x: terminated callback thread\n", GetCurrentThreadId()); mutex_lock(&clnt_fd_lock); - while (vc_fd_locks[WINSOCK_HANDLE_HASH(ct_fd)]) - cond_wait(&vc_cv[WINSOCK_HANDLE_HASH(ct_fd)], &clnt_fd_lock); + while (vc_fd_locks[ct_fd]) + cond_wait(&vc_cv[ct_fd], &clnt_fd_lock); } if (ct->ct_closeit && ct->ct_fd != -1) { - (void)closesocket(ct->ct_fd); + (void)wintirpc_closesocket(ct->ct_fd); } XDR_DESTROY(&(ct->ct_xdrs)); if (ct->ct_addr.buf) @@ -947,7 +945,7 @@ clnt_vc_destroy(cl) mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); // thr_sigsetmask(SIG_SETMASK, &(mask), NULL); - cond_signal(&vc_cv[WINSOCK_HANDLE_HASH(ct_fd)]); + cond_signal(&vc_cv[ct_fd]); } /* @@ -971,7 +969,7 @@ read_vc(ctp, buf, len) if (len == 0) return (0); - fd.fd = ct->ct_fd; + fd.fd = _get_osfhandle(ct->ct_fd); fd.events = POLLIN; for (;;) { switch (poll(&fd, 1, milliseconds)) { @@ -990,7 +988,7 @@ read_vc(ctp, buf, len) break; } - len = recv(ct->ct_fd, buf, (size_t)len, 0); + len = recv(_get_osfhandle(ct->ct_fd), buf, (size_t)len, 0); errno = WSAGetLastError(); switch (len) { @@ -1019,7 +1017,7 @@ write_vc(ctp, buf, len) int i = 0, cnt; for (cnt = len; cnt > 0; cnt -= i, buf += i) { - if ((i = send(ct->ct_fd, buf, (size_t)cnt, 0)) == SOCKET_ERROR) { + if ((i = wintirpc_send(ct->ct_fd, buf, (size_t)cnt, 0)) == SOCKET_ERROR) { ct->ct_error.re_errno = WSAGetLastError(); ct->ct_error.re_status = RPC_CANTSEND; return (-1); diff --git a/libtirpc/src/getpeereid.c b/libtirpc/src/getpeereid.c index df8365f..17b1a5c 100644 --- a/libtirpc/src/getpeereid.c +++ b/libtirpc/src/getpeereid.c @@ -36,7 +36,7 @@ #ifdef _WIN32 int -getpeereid(SOCKET s, uid_t *euid, gid_t *egid) +getpeereid(int s, uid_t *euid, gid_t *egid) { // XXX Need to figure out what to do here for Windows! return -1; @@ -50,7 +50,7 @@ getpeereid(int s, uid_t *euid, gid_t *egid) int error; uclen = sizeof(uc); - error = getsockopt(s, SOL_SOCKET, SO_PEERCRED, &uc, &uclen); /* SCM_CREDENTIALS */ + error = getsockopt(_get_osfhandle(s), SOL_SOCKET, SO_PEERCRED, &uc, &uclen); /* SCM_CREDENTIALS */ if (error != 0) return (error); // if (uc.cr_version != XUCRED_VERSION) diff --git a/libtirpc/src/pmap_getmaps.c b/libtirpc/src/pmap_getmaps.c index c6ad2bb..daf9e74 100644 --- a/libtirpc/src/pmap_getmaps.c +++ b/libtirpc/src/pmap_getmaps.c @@ -66,7 +66,7 @@ pmap_getmaps(address) struct sockaddr_in *address; { struct pmaplist *head = NULL; - SOCKET sock = INVALID_SOCKET; + int sock = INVALID_SOCKET; struct timeval minutetimeout; CLIENT *client; diff --git a/libtirpc/src/rpc_com.h b/libtirpc/src/rpc_com.h index a69d7f0..ff9db44 100644 --- a/libtirpc/src/rpc_com.h +++ b/libtirpc/src/rpc_com.h @@ -62,7 +62,7 @@ __BEGIN_DECLS extern u_int __rpc_get_a_size(int); extern int __rpc_dtbsize(void); -extern struct netconfig * __rpcgettp(SOCKET); +extern struct netconfig * __rpcgettp(int); extern int __rpc_get_default_domain(char **); struct netbuf *__rpc_set_netbuf(struct netbuf *, const void *, size_t); @@ -73,7 +73,7 @@ int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **); int __rpc_seman2socktype(int); int __rpc_socktype2seman(int); void *rpc_nullproc(CLIENT *); -int __rpc_sockisbound(SOCKET); +int __rpc_sockisbound(int); struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *, const char *, CLIENT **); diff --git a/libtirpc/src/rpc_generic.c b/libtirpc/src/rpc_generic.c index 42dca45..8ac2063 100644 --- a/libtirpc/src/rpc_generic.c +++ b/libtirpc/src/rpc_generic.c @@ -110,7 +110,8 @@ int __rpc_dtbsize() { #ifdef _WIN32 - return (WINSOCK_HANDLE_HASH_SIZE); + /* gisburn: Is |FD_SETSIZE| really correct here ? */ + return (FD_SETSIZE); #else static int tbsize; @@ -462,7 +463,7 @@ rpc_nullproc(clnt) */ struct netconfig * __rpcgettp(fd) - SOCKET fd; + int fd; { const char *netid; struct __rpc_sockinfo si; @@ -478,7 +479,7 @@ __rpcgettp(fd) } int -__rpc_fd2sockinfo(SOCKET fd, struct __rpc_sockinfo *sip) +__rpc_fd2sockinfo(int fd, struct __rpc_sockinfo *sip) { socklen_t len; int type, proto; @@ -487,7 +488,7 @@ __rpc_fd2sockinfo(SOCKET fd, struct __rpc_sockinfo *sip) #ifdef _WIN32 WSAPROTOCOL_INFO proto_info; int proto_info_size = sizeof(proto_info); - if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { + if (getsockopt(_get_osfhandle(fd), SOL_SOCKET, SO_PROTOCOL_INFO, (char *)&proto_info, &proto_info_size) == SOCKET_ERROR) { int err = WSAGetLastError(); return 0; } @@ -495,14 +496,14 @@ __rpc_fd2sockinfo(SOCKET fd, struct __rpc_sockinfo *sip) ss.ss_family = (ADDRESS_FAMILY)proto_info.iAddressFamily; #else len = sizeof ss; - if (getsockname(fd, (struct sockaddr *)&ss, &len) == SOCKET_ERROR) { + if (getsockname(_get_osfhandle(fd), (struct sockaddr *)&ss, &len) == SOCKET_ERROR) { return 0; } #endif sip->si_alen = len; len = sizeof type; - if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&type, &len) == SOCKET_ERROR) { + if (getsockopt(_get_osfhandle(fd), SOL_SOCKET, SO_TYPE, (char *)&type, &len) == SOCKET_ERROR) { int err = WSAGetLastError(); return 0; } @@ -554,20 +555,20 @@ __rpc_nconf2sockinfo(const struct netconfig *nconf, struct __rpc_sockinfo *sip) return 0; } -SOCKET +int __rpc_nconf2fd(const struct netconfig *nconf) { struct __rpc_sockinfo si; - SOCKET fd; + int fd; if (!__rpc_nconf2sockinfo(nconf, &si)) return 0; - if ((fd = socket(si.si_af, si.si_socktype, si.si_proto)) != INVALID_SOCKET && + if ((fd = wintirpc_socket(si.si_af, si.si_socktype, si.si_proto)) != -1 && si.si_af == AF_INET6) { int val = 1; - setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, (const char *)&val, sizeof(val)); + setsockopt(_get_osfhandle(fd), SOL_IPV6, IPV6_V6ONLY, (const char *)&val, sizeof(val)); } return fd; } @@ -876,7 +877,7 @@ __rpc_fixup_addr(struct netbuf *new, const struct netbuf *svc) } int -__rpc_sockisbound(SOCKET fd) +__rpc_sockisbound(int fd) { struct sockaddr_storage ss; union { @@ -889,7 +890,7 @@ __rpc_sockisbound(SOCKET fd) socklen_t slen; slen = sizeof (struct sockaddr_storage); - if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) + if (getsockname(_get_osfhandle(fd), (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) return 0; switch (ss.ss_family) { diff --git a/libtirpc/src/rpc_soc.c b/libtirpc/src/rpc_soc.c index 4b69810..0cbb749 100644 --- a/libtirpc/src/rpc_soc.c +++ b/libtirpc/src/rpc_soc.c @@ -68,7 +68,7 @@ extern mutex_t rpcsoc_lock; static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t, int *, u_int, u_int, char *); -static SVCXPRT *svc_com_create(SOCKET, u_int, u_int, char *); +static SVCXPRT *svc_com_create(int, u_int, u_int, char *); static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *); /* XXX */ @@ -83,14 +83,14 @@ clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp) struct sockaddr_in *raddr; rpcprog_t prog; rpcvers_t vers; - SOCKET *sockp; + int *sockp; u_int sendsz; u_int recvsz; char *tp; { CLIENT *cl; int madefd = FALSE; - SOCKET fd = *sockp; + int fd = *sockp; struct netconfig *nconf; struct netbuf bindaddr; @@ -148,7 +148,7 @@ syserror: rpc_createerr.cf_error.re_errno = errno; err: if (madefd == TRUE) - (void)closesocket(fd); + (void)wintirpc_closesocket(fd); (void) freenetconfigent(nconf); mutex_unlock(&rpcsoc_lock); return (NULL); @@ -263,7 +263,7 @@ clntraw_create(prog, vers) */ static SVCXPRT * svc_com_create(fd, sendsize, recvsize, netid) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; char *netid; @@ -292,12 +292,12 @@ svc_com_create(fd, sendsize, recvsize, netid) memset(&sin, 0, sizeof sin); sin.sin_family = AF_INET; bindresvport(fd, &sin); - listen(fd, SOMAXCONN); + wintirpc_listen(fd, SOMAXCONN); svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize); (void) freenetconfigent(nconf); if (svc == NULL) { if (madefd) - (void)closesocket(fd); + (void)wintirpc_closesocket(fd); return (NULL); } port = (((struct sockaddr_in *)svc->xp_ltaddr.buf)->sin_port); @@ -307,7 +307,7 @@ svc_com_create(fd, sendsize, recvsize, netid) SVCXPRT * svctcp_create(fd, sendsize, recvsize) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; { @@ -319,7 +319,7 @@ svctcp_create(fd, sendsize, recvsize) SVCXPRT * svcudp_bufcreate(fd, sendsz, recvsz) - SOCKET fd; + int fd; u_int sendsz, recvsz; { @@ -330,7 +330,7 @@ svcudp_bufcreate(fd, sendsz, recvsz) SVCXPRT * svcfd_create(fd, sendsize, recvsize) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; { @@ -341,7 +341,7 @@ svcfd_create(fd, sendsize, recvsize) SVCXPRT * svcudp_create(fd) - SOCKET fd; + int fd; { return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp"); @@ -522,7 +522,7 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz) struct sockaddr_un *raddr; u_long prog; u_long vers; - SOCKET *sockp; + int *sockp; u_int sendsz; u_int recvsz; { @@ -543,17 +543,17 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz) return(cl); } if (*sockp == SOCKET_ERROR) { - *sockp = socket(AF_UNIX, SOCK_STREAM, 0); + *sockp = wintirpc_socket(AF_UNIX, SOCK_STREAM, 0); len = SUN_LEN(raddr); - if ((*sockp == INVALID_SOCKET) || (connect(*sockp, + if ((*sockp == -1) || (connect(_get_osfhandle(*sockp), (struct sockaddr *)raddr, len) == SOCKET_ERROR)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; - if (*sockp != INVALID_SOCKET) - (void)closesocket(*sockp); + if (*sockp != -1) + (void)wintirpc_closesocket(*sockp); goto done; } - } + } svcaddr->buf = raddr; svcaddr->len = sizeof(raddr); svcaddr->maxlen = sizeof (struct sockaddr_un); @@ -571,7 +571,7 @@ done: */ SVCXPRT * svcunix_create(sock, sendsize, recvsize, path) - SOCKET sock; + int sock; u_int sendsize; u_int recvsize; char *path; @@ -603,7 +603,7 @@ svcunix_create(sock, sendsize, recvsize, path) addrlen = sizeof(struct sockaddr_un); sa = (struct sockaddr *)&sun; - if (bind(sock, sa, addrlen) == SOCKET_ERROR) + if (bind(_get_osfhandle(sock), sa, addrlen) == SOCKET_ERROR) goto done; taddr.addr.len = taddr.addr.maxlen = addrlen; @@ -613,7 +613,7 @@ svcunix_create(sock, sendsize, recvsize, path) memcpy(taddr.addr.buf, sa, addrlen); if (nconf->nc_semantics != NC_TPI_CLTS) { - if (listen(sock, SOMAXCONN) == SOCKET_ERROR) { + if (wintirpc_listen(sock, SOMAXCONN) == SOCKET_ERROR) { free(taddr.addr.buf); goto done; } @@ -632,7 +632,7 @@ done: */ SVCXPRT * svcunixfd_create(fd, sendsize, recvsize) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; { diff --git a/libtirpc/src/rpcb_clnt.c b/libtirpc/src/rpcb_clnt.c index b8c30c1..aafab64 100644 --- a/libtirpc/src/rpcb_clnt.c +++ b/libtirpc/src/rpcb_clnt.c @@ -423,7 +423,7 @@ local_rpcb() static struct netconfig *loopnconf; static char *hostname; extern mutex_t loopnconf_lock; - SOCKET sock; + int sock; size_t tsize; struct netbuf nbuf; struct sockaddr_un sun; @@ -434,9 +434,10 @@ local_rpcb() * the netconfig file. */ memset(&sun, 0, sizeof sun); - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock == INVALID_SOCKET) + sock = wintirpc_socket(AF_UNIX, SOCK_STREAM, 0); + if (sock == -1) goto try_nconf; + sun.sun_family = AF_UNIX; strcpy(sun.sun_path, _PATH_RPCBINDSOCK); nbuf.len = SUN_LEN(&sun); @@ -455,7 +456,7 @@ local_rpcb() } /* Nobody needs this socket anymore; free the descriptor. */ - closesocket(sock); + wintirpc_closesocket(sock); try_nconf: @@ -464,7 +465,7 @@ try_nconf: if (loopnconf == NULL) { struct netconfig *nconf, *tmpnconf = NULL; void *nc_handle; - SOCKET fd; + int fd; nc_handle = setnetconfig(); if (nc_handle == NULL) { @@ -490,7 +491,7 @@ try_nconf: */ if (fd == SOCKET_ERROR) continue; - closesocket(fd); + wintirpc_closesocket(fd); tmpnconf = nconf; if (!strcmp(nconf->nc_protofmly, NC_INET)) hostname = IN4_LOCALHOST_STRING; @@ -657,7 +658,7 @@ __rpcbind_is_up() struct netconfig *nconf; struct sockaddr_un sun; void *localhandle; - SOCKET sock; + int sock; nconf = NULL; localhandle = setnetconfig(); @@ -672,18 +673,19 @@ __rpcbind_is_up() endnetconfig(localhandle); memset(&sun, 0, sizeof sun); - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock == INVALID_SOCKET) + sock = wintirpc_socket(AF_UNIX, SOCK_STREAM, 0); + if (sock == -1) return (FALSE); + sun.sun_family = AF_UNIX; strncpy(sun.sun_path, _PATH_RPCBINDSOCK, sizeof(sun.sun_path)); - if (connect(sock, (struct sockaddr *)&sun, sizeof(sun)) == SOCKET_ERROR) { - closesocket(sock); + if (connect(_get_osfhandle(sock), (struct sockaddr *)&sun, sizeof(sun)) == SOCKET_ERROR) { + wintirpc_closesocket(sock); return (FALSE); } - closesocket(sock); + wintirpc_closesocket(sock); return (TRUE); } diff --git a/libtirpc/src/rtime.c b/libtirpc/src/rtime.c index f933ff6..ea49fef 100644 --- a/libtirpc/src/rtime.c +++ b/libtirpc/src/rtime.c @@ -59,7 +59,7 @@ extern int _rpc_dtablesize( void ); #define NYEARS (unsigned long)(1970 - 1900) #define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4))) -static void do_close( SOCKET ); +static void do_close( int ); int rtime(addrp, timep, timeout) @@ -67,7 +67,7 @@ rtime(addrp, timep, timeout) struct timeval *timep; struct timeval *timeout; { - SOCKET s; + int s; fd_set readfds; int res; unsigned long thetime; @@ -81,10 +81,11 @@ rtime(addrp, timep, timeout) } else { type = SOCK_DGRAM; } - s = socket(AF_INET, type, 0); - if (s == INVALID_SOCKET) { + s = wintirpc_socket(AF_INET, type, 0); + if (s == -1) { return(-1); } + addrp->sin_family = AF_INET; /* TCP and UDP port are the same in this case */ @@ -95,7 +96,7 @@ rtime(addrp, timep, timeout) addrp->sin_port = serv->s_port; if (type == SOCK_DGRAM) { - res = sendto(s, (char *)&thetime, sizeof(thetime), 0, + res = wintirpc_sendto(s, (char *)&thetime, sizeof(thetime), 0, (struct sockaddr *)addrp, sizeof(*addrp)); if (res == SOCKET_ERROR) { do_close(s); @@ -103,7 +104,7 @@ rtime(addrp, timep, timeout) } do { FD_ZERO(&readfds); - FD_SET(s, &readfds); + FD_SET(_get_osfhandle(s), &readfds); res = select(_rpc_dtablesize(), &readfds, (fd_set *)NULL, (fd_set *)NULL, timeout); } while (res == SOCKET_ERROR && WSAGetLastError() == WSAEINTR); @@ -115,18 +116,18 @@ rtime(addrp, timep, timeout) return(-1); } fromlen = sizeof(from); - res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0, + res = recvfrom(_get_osfhandle(s), (char *)&thetime, sizeof(thetime), 0, (struct sockaddr *)&from, &fromlen); do_close(s); if (res == SOCKET_ERROR) { return(-1); } } else { - if (connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) == SOCKET_ERROR) { + if (connect(_get_osfhandle(s), (struct sockaddr *)addrp, sizeof(*addrp)) == SOCKET_ERROR) { do_close(s); return(-1); } - res = recv(s, (char *)&thetime, sizeof(thetime), 0); + res = recv(_get_osfhandle(s), (char *)&thetime, sizeof(thetime), 0); do_close(s); if (res == SOCKET_ERROR) { return(-1); @@ -149,6 +150,6 @@ do_close(s) int save; save = errno; - (void)closesocket(s); + (void)wintirpc_closesocket(s); errno = save; } diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c index 1666364..2932db7 100644 --- a/libtirpc/src/svc.c +++ b/libtirpc/src/svc.c @@ -97,7 +97,7 @@ void xprt_register (xprt) SVCXPRT *xprt; { - SOCKET sock; + int sock; assert (xprt != NULL); @@ -115,7 +115,7 @@ xprt_register (xprt) #ifndef _WIN32 if (sock < FD_SETSIZE) { __svc_xports[sock] = xprt; - FD_SET (sock, &svc_fdset); + FD_SET(_get_osfhandle(sock), &svc_fdset); svc_maxfd = max (svc_maxfd, sock); } #else @@ -144,7 +144,7 @@ __xprt_do_unregister (xprt, dolock) SVCXPRT *xprt; bool_t dolock; { - SOCKET sock; + int sock; assert (xprt != NULL); @@ -155,7 +155,7 @@ bool_t dolock; rwlock_wrlock (&svc_fd_lock); if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) { __svc_xports[sock] = NULL; - FD_CLR (sock, &svc_fdset); + FD_CLR (_get_osfhandle(sock), &svc_fdset); if (sock >= svc_maxfd) { for (svc_maxfd--; svc_maxfd >= 0; svc_maxfd--) if (__svc_xports[svc_maxfd]) @@ -638,7 +638,7 @@ svc_getreqset (readfds) } void -svc_getreq_common (SOCKET fd) +svc_getreq_common (int fd) { SVCXPRT *xprt; struct svc_req r; @@ -771,11 +771,11 @@ svc_getreq_poll (pfdp, pollretval) if (p->revents & POLLNVAL) { rwlock_wrlock (&svc_fd_lock); - FD_CLR (p->fd, &svc_fdset); + FD_CLR (_get_osfhandle(p->fd), &svc_fdset); rwlock_unlock (&svc_fd_lock); } else - svc_getreq_common (p->fd); + svc_getreq_common (wintirpc_handle2fd(p->fd)); } } } diff --git a/libtirpc/src/svc_dg.c b/libtirpc/src/svc_dg.c index d8dcada..8610c7a 100644 --- a/libtirpc/src/svc_dg.c +++ b/libtirpc/src/svc_dg.c @@ -138,7 +138,7 @@ svc_dg_create(fd, sendsize, recvsize) xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); slen = sizeof ss; - if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) + if (getsockname(_get_osfhandle(fd), (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) goto freedata; __rpc_set_netbuf(&xprt->xp_ltaddr, &ss, slen); @@ -177,7 +177,7 @@ svc_dg_recv(xprt, msg) again: alen = sizeof (struct sockaddr_storage); - rlen = recvfrom(xprt->xp_fd, rpc_buffer(xprt), su->su_iosz, 0, + rlen = recvfrom(_get_osfhandle(xprt->xp_fd), rpc_buffer(xprt), su->su_iosz, 0, (struct sockaddr *)(void *)&ss, &alen); if (rlen == -1 && errno == EINTR) goto again; @@ -194,7 +194,7 @@ again: su->su_xid = msg->rm_xid; if (su->su_cache != NULL) { if (cache_get(xprt, msg, &reply, &replylen)) { - (void)sendto(xprt->xp_fd, reply, replylen, 0, + (void)wintirpc_sendto(xprt->xp_fd, reply, replylen, 0, (struct sockaddr *)(void *)&ss, alen); return (FALSE); } @@ -217,7 +217,7 @@ svc_dg_reply(xprt, msg) msg->rm_xid = su->su_xid; if (xdr_replymsg(xdrs, msg)) { slen = XDR_GETPOS(xdrs); - if (sendto(xprt->xp_fd, rpc_buffer(xprt), slen, 0, + if (wintirpc_sendto(xprt->xp_fd, rpc_buffer(xprt), slen, 0, (struct sockaddr *)xprt->xp_rtaddr.buf, (socklen_t)xprt->xp_rtaddr.len) == (ssize_t) slen) { stat = TRUE; @@ -257,7 +257,7 @@ svc_dg_destroy(xprt) xprt_unregister(xprt); if (xprt->xp_fd != -1) - (void)closesocket(xprt->xp_fd); + (void)wintirpc_closesocket(xprt->xp_fd); XDR_DESTROY(&(su->su_xdrs)); (void) mem_free(rpc_buffer(xprt), su->su_iosz); (void) mem_free(su, sizeof (*su)); diff --git a/libtirpc/src/svc_generic.c b/libtirpc/src/svc_generic.c index d84f237..80f5e87 100644 --- a/libtirpc/src/svc_generic.c +++ b/libtirpc/src/svc_generic.c @@ -180,7 +180,7 @@ svc_tp_create(dispatch, prognum, versnum, nconf) */ SVCXPRT * svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz) - SOCKET fd; /* Connection end point */ + int fd; /* Connection end point */ const struct netconfig *nconf; /* Netconfig struct for nettoken */ const struct t_bind *bindaddr; /* Local bind address */ u_int sendsz; /* Max sendsize */ @@ -225,23 +225,23 @@ svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz) if (bindresvport(fd, NULL) < 0) { memset(&ss, 0, sizeof ss); ss.ss_family = si.si_af; - if (bind(fd, (struct sockaddr *)(void *)&ss, + if (bind(_get_osfhandle(fd), (struct sockaddr *)(void *)&ss, (socklen_t)si.si_alen) == SOCKET_ERROR) { // XXX warnx( // "svc_tli_create: could not bind to anonymous port"); goto freedata; } } - listen(fd, SOMAXCONN); + wintirpc_listen(fd, SOMAXCONN); } else { - if (bind(fd, + if (bind(_get_osfhandle(fd), (struct sockaddr *)bindaddr->addr.buf, (socklen_t)si.si_alen) == SOCKET_ERROR) { // XXX warnx( // "svc_tli_create: could not bind to requested address"); goto freedata; } - listen(fd, (int)bindaddr->qlen); + wintirpc_listen(fd, (int)bindaddr->qlen); } } @@ -292,7 +292,7 @@ svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz) freedata: if (madefd) - (void)closesocket(fd); + (void)wintirpc_closesocket(fd); if (xprt) { if (!madefd) /* so that svc_destroy doesnt close fd */ xprt->xp_fd = RPC_ANYFD; diff --git a/libtirpc/src/svc_vc.c b/libtirpc/src/svc_vc.c index 53f0df3..fcb6ff3 100644 --- a/libtirpc/src/svc_vc.c +++ b/libtirpc/src/svc_vc.c @@ -67,7 +67,7 @@ extern rwlock_t svc_fd_lock; -static SVCXPRT *makefd_xprt(SOCKET, u_int, u_int); +static SVCXPRT *makefd_xprt(int, u_int, u_int); static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *); static enum xprt_stat rendezvous_stat(SVCXPRT *); static void svc_vc_destroy(SVCXPRT *); @@ -179,7 +179,7 @@ svc_vc_create(fd, sendsize, recvsize) xprt->xp_fd = fd; slen = sizeof (struct sockaddr_storage); - if (getsockname(fd, (struct sockaddr *)(void *)&sslocal, &slen) == SOCKET_ERROR) { + if (getsockname(_get_osfhandle(fd), (struct sockaddr *)(void *)&sslocal, &slen) == SOCKET_ERROR) { // XXX warnx("svc_vc_create: could not retrieve local addr"); goto cleanup_svc_vc_create; } @@ -202,7 +202,7 @@ cleanup_svc_vc_create: */ SVCXPRT * svc_fd_create(fd, sendsize, recvsize) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; { @@ -217,7 +217,7 @@ svc_fd_create(fd, sendsize, recvsize) return NULL; slen = sizeof (struct sockaddr_storage); - if (getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) { + if (getsockname(_get_osfhandle(fd), (struct sockaddr *)(void *)&ss, &slen) == SOCKET_ERROR) { // XXX warnx("svc_fd_create: could not retrieve local addr"); goto freedata; } @@ -250,7 +250,7 @@ freedata: static SVCXPRT * makefd_xprt(fd, sendsize, recvsize) - SOCKET fd; + int fd; u_int sendsize; u_int recvsize; { @@ -302,7 +302,7 @@ rendezvous_request(xprt, msg) SVCXPRT *xprt; struct rpc_msg *msg; { - SOCKET sock; + int sock; #ifndef _WIN32 int flags; #endif @@ -320,7 +320,7 @@ rendezvous_request(xprt, msg) r = (struct cf_rendezvous *)xprt->xp_p1; again: len = sizeof addr; - if ((sock = accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr, + if ((sock = wintirpc_accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr, &len)) == SOCKET_ERROR) { if (errno == EINTR) goto again; @@ -355,7 +355,7 @@ again: if (__rpc_fd2sockinfo(sock, &si) && si.si_proto == IPPROTO_TCP) { len = 1; /* XXX fvdl - is this useful? */ - setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (const char *)&len, sizeof (len)); + setsockopt(_get_osfhandle(sock), IPPROTO_TCP, TCP_NODELAY, (const char *)&len, sizeof (len)); } cd = (struct cf_conn *)newxprt->xp_p1; @@ -413,7 +413,7 @@ __svc_vc_dodestroy(xprt) cd = (struct cf_conn *)xprt->xp_p1; if (xprt->xp_fd != RPC_ANYFD) - (void)closesocket(xprt->xp_fd); + (void)wintirpc_closesocket(xprt->xp_fd); if (xprt->xp_port != 0) { /* a rendezvouser socket */ r = (struct cf_rendezvous *)xprt->xp_p1; @@ -483,7 +483,7 @@ read_vc(xprtp, buf, len) int len; { SVCXPRT *xprt; - SOCKET sock; + int sock; int milliseconds = 35 * 1000; struct pollfd pollfd; struct cf_conn *cfp; @@ -497,7 +497,7 @@ read_vc(xprtp, buf, len) if (cfp->nonblock) { #ifdef _WIN32 - len = recv(sock, buf, (size_t)len, 0); + len = recv(_get_osfhandle(sock), buf, (size_t)len, 0); #else len = read(sock, buf, (size_t)len); #endif @@ -513,7 +513,7 @@ read_vc(xprtp, buf, len) } do { - pollfd.fd = sock; + pollfd.fd = _get_osfhandle(sock); pollfd.events = POLLIN; pollfd.revents = 0; switch (poll(&pollfd, 1, milliseconds)) { @@ -530,7 +530,7 @@ read_vc(xprtp, buf, len) } while ((pollfd.revents & POLLIN) == 0); #ifdef _WIN32 - if ((len = recv(sock, buf, (size_t)len, 0)) > 0) { + if ((len = recv(_get_osfhandle(sock), buf, (size_t)len, 0)) > 0) { #else if ((len = read(sock, buf, (size_t)len)) > 0) { #endif @@ -568,7 +568,7 @@ write_vc(xprtp, buf, len) for (cnt = len; cnt > 0; cnt -= i, buf += i) { #ifdef _WIN32 - i = send(xprt->xp_fd, buf, (size_t)cnt, 0); + i = wintirpc_send(xprt->xp_fd, buf, (size_t)cnt, 0); #else i = write(xprt->xp_fd, buf, (size_t)cnt); #endif @@ -752,7 +752,7 @@ svc_vc_rendezvous_ops(xprt) */ int __rpc_get_local_uid(SVCXPRT *transp, uid_t *uid) { - SOCKET sock; + int sock; int ret; gid_t egid; uid_t euid; diff --git a/libtirpc/src/wintirpc.c b/libtirpc/src/wintirpc.c index eb98489..4937543 100644 --- a/libtirpc/src/wintirpc.c +++ b/libtirpc/src/wintirpc.c @@ -3,6 +3,7 @@ * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -23,6 +24,7 @@ #include <rpc/rpc.h> #include <stdio.h> #include <winsock.h> +#include <assert.h> WSADATA WSAData; @@ -159,6 +161,143 @@ BOOL WINAPI DllMain/*tirpc_main*/(HINSTANCE hinstDLL, // DLL module handle return TRUE; } +struct map_osfhandle_fd +{ + SOCKET m_s; + int m_fd; +}; + +#define MAP_OSFHANDLE_SIZE (1024) + +static +struct map_osfhandle_fd handle_fd_map[MAP_OSFHANDLE_SIZE]; + +void wintirpc_register_osfhandle_fd(SOCKET handle, int fd) +{ + assert(handle != 0); + assert(handle != SOCKET_ERROR); + assert(fd < MAP_OSFHANDLE_SIZE); + + handle_fd_map[fd].m_fd = fd; + handle_fd_map[fd].m_s = handle; +} + +void wintirpc_unregister_osfhandle(SOCKET handle) +{ + int i; + + assert(handle != 0); + assert(handle != SOCKET_ERROR); + + for (i=0 ; i < MAP_OSFHANDLE_SIZE ; i++) { + if (handle_fd_map[i].m_s == handle) { + handle_fd_map[i].m_s = SOCKET_ERROR; + handle_fd_map[i].m_fd = -1; + return; + } + } + (void)fprintf(stderr, "wintirpc_unregister_osfhandle: failed\n"); +} + +int wintirpc_handle2fd(SOCKET handle) +{ + int i; + + assert(handle != 0); + assert(handle != SOCKET_ERROR); + + for (i=0 ; i < MAP_OSFHANDLE_SIZE ; i++) { + if ((handle_fd_map[i].m_s == handle) && + (handle_fd_map[i].m_fd != -1)) { + return handle_fd_map[i].m_fd; + } + } + + (void)fprintf(stderr, "wintirpc_handle2fd: failed\n"); + return -1; +} + +int wintirpc_socket(int af, int type, int protocol) +{ + SOCKET s; + + s = socket(af, type, protocol); + if (s == INVALID_SOCKET) { + (void)fprintf(stderr, "wintirpc_socket: INVALID_SOCKET\n"); + return -1; + } + + int fd = _open_osfhandle(s, _O_BINARY); + if (fd < 0) { + (void)closesocket(s); + /* + * |_open_osfhandle()| may not set |errno|, and + * |closesocket()| may override it + */ + (void)fprintf(stderr, "wintirpc_socket: failed\n"); + errno = ENOMEM; + return -1; + } + + wintirpc_register_osfhandle_fd(s, fd); + + (void)fprintf(stderr, "wintirpc_socket: %s/%d: sock fd=%d\n", __FILE__, (int)__LINE__, fd); + + return fd; +} + +int wintirpc_closesocket(int in_fd) +{ + SOCKET s = _get_osfhandle(in_fd); + + wintirpc_unregister_osfhandle(s); + + return closesocket(s); +} + +int wintirpc_listen(int in_s, int backlog) +{ + return listen(_get_osfhandle(in_s), backlog); +} + +int wintirpc_accept(int in_s_fd, struct sockaddr *addr, int *addrlen) +{ + SOCKET in_s; + SOCKET out_s; + int out_s_fd; + + in_s = _get_osfhandle(in_s_fd); + + out_s = accept(in_s, addr, addrlen); + + out_s_fd = _open_osfhandle(out_s, _O_BINARY); + if (out_s_fd < 0) { + (void)closesocket(out_s); + /* + * |_open_osfhandle()| may not set |errno|, and + * |closesocket()| may override it + */ + (void)fprintf(stderr, "wintirpc_accept: failed\n"); + errno = ENOMEM; + return -1; + } + + wintirpc_register_osfhandle_fd(out_s, out_s_fd); + + return out_s_fd; +} + +int wintirpc_send(int s, const char *buf, int len, int flags) +{ + return send(_get_osfhandle(s), buf, len, flags); +} + +int wintirpc_sendto(int s, const char *buf, int len, int flags, + const struct sockaddr *to, int tolen) +{ + return(sendto(_get_osfhandle(s), buf, len, flags, to, tolen)); +} + int tirpc_exit(void) { if (init == 0 || --init > 0) @@ -167,7 +306,6 @@ int tirpc_exit(void) return WSACleanup(); } - void wintirpc_debug(char *fmt, ...) { #ifdef _DEBUG diff --git a/libtirpc/tirpc/getpeereid.h b/libtirpc/tirpc/getpeereid.h index cdecd0e..025143f 100644 --- a/libtirpc/tirpc/getpeereid.h +++ b/libtirpc/tirpc/getpeereid.h @@ -1,2 +1,2 @@ -int getpeereid(SOCKET s, uid_t *euid, gid_t *egid); +int getpeereid(int s, uid_t *euid, gid_t *egid); diff --git a/libtirpc/tirpc/rpc/clnt.h b/libtirpc/tirpc/rpc/clnt.h index 0ee9724..3639f82 100644 --- a/libtirpc/tirpc/rpc/clnt.h +++ b/libtirpc/tirpc/rpc/clnt.h @@ -393,7 +393,7 @@ extern CLIENT * clnt_tp_create_timed(const char *, const rpcprog_t, * Generic TLI create routine. Only provided for compatibility. */ -extern CLIENT *clnt_tli_create(const SOCKET, const struct netconfig *, +extern CLIENT *clnt_tli_create(const int, const struct netconfig *, struct netbuf *, const rpcprog_t, const rpcvers_t, const u_int, const u_int, int (*cb_xdr)(void *, void *), @@ -411,7 +411,7 @@ extern CLIENT *clnt_tli_create(const SOCKET, const struct netconfig *, /* * Low level clnt create routine for connectionful transports, e.g. tcp. */ -extern CLIENT *clnt_vc_create(const SOCKET, const struct netbuf *, +extern CLIENT *clnt_vc_create(const int, const struct netbuf *, const rpcprog_t, const rpcvers_t, u_int, u_int, int (*cb_xdr)(void *, void *), int (*cb)(void *, void *, void **), void *args); @@ -432,7 +432,7 @@ extern CLIENT *clntunix_create(struct sockaddr_un *, /* * Low level clnt create routine for connectionless transports, e.g. udp. */ -extern CLIENT *clnt_dg_create(const SOCKET, const struct netbuf *, +extern CLIENT *clnt_dg_create(const int, const struct netbuf *, const rpcprog_t, const rpcvers_t, const u_int, const u_int); /* diff --git a/libtirpc/tirpc/rpc/clnt_soc.h b/libtirpc/tirpc/rpc/clnt_soc.h index 582f555..4cf4d78 100644 --- a/libtirpc/tirpc/rpc/clnt_soc.h +++ b/libtirpc/tirpc/rpc/clnt_soc.h @@ -62,7 +62,7 @@ * u_int recvsz; */ __BEGIN_DECLS -extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, SOCKET *, +extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *, u_int, u_int); __END_DECLS diff --git a/libtirpc/tirpc/rpc/rpc.h b/libtirpc/tirpc/rpc/rpc.h index 685fe42..e136149 100644 --- a/libtirpc/tirpc/rpc/rpc.h +++ b/libtirpc/tirpc/rpc/rpc.h @@ -82,7 +82,7 @@ __BEGIN_DECLS extern int get_myaddress(struct sockaddr_in *); -extern int bindresvport(SOCKET, struct sockaddr_in *) __THROW; +extern int bindresvport(int, struct sockaddr_in *) __THROW; extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]), xdrproc_t, xdrproc_t); extern int callrpc(const char *, int, int, int, xdrproc_t, void *, @@ -96,7 +96,7 @@ void freeuaddr(char *); /* free memory allocated by taddr2uaddr */ void freenetbuf(struct netbuf *); /* free memory allocated by uaddr2taddr */ struct sockaddr; -extern int bindresvport_sa(SOCKET, struct sockaddr *); +extern int bindresvport_sa(int, struct sockaddr *); __END_DECLS /* @@ -104,9 +104,9 @@ __END_DECLS * and rpcbind use only. Do not use, they may change without notice. */ __BEGIN_DECLS -SOCKET __rpc_nconf2fd(const struct netconfig *); +int __rpc_nconf2fd(const struct netconfig *); int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *); -int __rpc_fd2sockinfo(SOCKET, struct __rpc_sockinfo *); +int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *); u_int __rpc_get_t_size(int, int, int); __END_DECLS diff --git a/libtirpc/tirpc/rpc/rpc_com.h b/libtirpc/tirpc/rpc/rpc_com.h index adde181..096cf23 100644 --- a/libtirpc/tirpc/rpc/rpc_com.h +++ b/libtirpc/tirpc/rpc/rpc_com.h @@ -74,7 +74,7 @@ int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **); int __rpc_seman2socktype(int); int __rpc_socktype2seman(int); void *rpc_nullproc(CLIENT *); -int __rpc_sockisbound(SOCKET); +int __rpc_sockisbound(int); struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *, const char *, CLIENT **); diff --git a/libtirpc/tirpc/rpc/svc.h b/libtirpc/tirpc/rpc/svc.h index a919c50..c39c1dc 100644 --- a/libtirpc/tirpc/rpc/svc.h +++ b/libtirpc/tirpc/rpc/svc.h @@ -88,7 +88,7 @@ enum xprt_stat { * Server side transport handle */ typedef struct __rpc_svcxprt { - SOCKET xp_fd; + int xp_fd; u_short xp_port; /* associated port number */ const struct xp_ops { /* receive incoming requests */ @@ -313,7 +313,7 @@ __END_DECLS __BEGIN_DECLS extern void svc_getreq(int); extern void svc_getreqset(fd_set *); -extern void svc_getreq_common(SOCKET); +extern void svc_getreq_common(int); struct pollfd; extern void svc_getreq_poll(struct pollfd *, int); @@ -364,11 +364,11 @@ extern SVCXPRT *svc_tp_create(void (*)(struct svc_req *, SVCXPRT *), /* * Generic TLI create routine */ -extern SVCXPRT *svc_tli_create(const SOCKET, const struct netconfig *, +extern SVCXPRT *svc_tli_create(const int, const struct netconfig *, const struct t_bind *, const u_int, const u_int); /* - * const SOCKET fd; -- connection end point + * const int fd; -- connection end point * const struct netconfig *nconf; -- netconfig structure for network * const struct t_bind *bindaddr; -- local bind address * const u_int sendsz; -- max sendsize @@ -379,9 +379,9 @@ extern SVCXPRT *svc_tli_create(const SOCKET, const struct netconfig *, * Connectionless and connectionful create routines */ -extern SVCXPRT *svc_vc_create(const SOCKET, const u_int, const u_int); +extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int); /* - * const SOCKET fd; -- open connection end point + * const int fd; -- open connection end point * const u_int sendsize; -- max send size * const u_int recvsize; -- max recv size */ @@ -391,9 +391,9 @@ extern SVCXPRT *svc_vc_create(const SOCKET, const u_int, const u_int); */ extern SVCXPRT *svcunix_create(int, u_int, u_int, char *); -extern SVCXPRT *svc_dg_create(const SOCKET, const u_int, const u_int); +extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int); /* - * const SOCKET fd; -- open connection + * const int fd; -- open connection * const u_int sendsize; -- max send size * const u_int recvsize; -- max recv size */ @@ -403,9 +403,9 @@ extern SVCXPRT *svc_dg_create(const SOCKET, const u_int, const u_int); * the routine takes any *open* connection * descriptor as its first input and is used for open connections. */ -extern SVCXPRT *svc_fd_create(const SOCKET, const u_int, const u_int); +extern SVCXPRT *svc_fd_create(const int, const u_int, const u_int); /* - * const SOCKET fd; -- open connection end point + * const int fd; -- open connection end point * const u_int sendsize; -- max send size * const u_int recvsize; -- max recv size */ diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h index a299835..608ee97 100644 --- a/libtirpc/tirpc/wintirpc.h +++ b/libtirpc/tirpc/wintirpc.h @@ -3,6 +3,7 @@ * * Olga Kornievskaia <aglo@umich.edu> * Casey Bodley <cbodley@umich.edu> + * Roland Mainz <roland.mainz@nrubsig.org> * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published by @@ -44,6 +45,13 @@ #include <windows.h> #include <process.h> #include <basetsd.h> +#include <fcntl.h> +#include <io.h> + +/* warn about int to pointer */ +#pragma warning (error : 4312) +/* conversion from 'int' to '_HFILE' of greater size */ +#pragma warning (error : 4306) //#define snprintf _snprintf //#define vsnprintf _vsnprintf @@ -63,12 +71,6 @@ #define __END_DECLS #define __THROW -/* - * Hash of Windows Socket Handle values - */ -#define WINSOCK_HANDLE_HASH_SIZE 1024 -#define WINSOCK_HANDLE_HASH(x) (((x) >> 2) % WINSOCK_HANDLE_HASH_SIZE) - /* * Functions imported from BSD */ @@ -78,15 +80,15 @@ struct timezone int tz_dsttime; /* type of dst correction */ }; -extern int gettimeofday(struct timeval *tv, struct timezone *tz); -extern int asprintf(char **str, const char *fmt, ...); - -#if(_WIN32_WINNT < 0x0501) -#define SOL_IPV6 IPPROTO_IPV6 -#endif - -#define MAXHOSTNAMELEN 256 - +extern int gettimeofday(struct timeval *tv, struct timezone *tz); +extern int asprintf(char **str, const char *fmt, ...); + +#if(_WIN32_WINNT < 0x0501) +#define SOL_IPV6 IPPROTO_IPV6 +#endif + +#define MAXHOSTNAMELEN 256 + struct sockaddr_un { int sun_family; char sun_path[MAX_PATH]; @@ -95,6 +97,17 @@ struct sockaddr_un { /* XXX Should this return size_t or unsigned int ?? */ #define SUN_LEN(ptr) ((unsigned int)(sizeof(int) + strlen ((ptr)->sun_path))) +/* Prototypes */ +int wintirpc_socket(int af,int type, int protocol); +int wintirpc_closesocket(int in_fd); +int wintirpc_listen(int in_s, int backlog); +int wintirpc_accept(int s_fd, struct sockaddr *addr, int *addrlen); +int winntirpc_send(int s, const char *buf, int len, int flags); +int wintirpc_sendto(int s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen); +void wintirpc_register_osfhandle_fd(SOCKET handle, int fd); +void wintirpc_unregister_osfhandle(SOCKET handle); +int wintirpc_handle2fd(SOCKET handle); + /* Debugging function */ void wintirpc_debug(char *fmt, ...); -- 2.39.0 From 973f282ae5cea050f910803391e28bfc723f294c Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Fri, 27 Oct 2023 18:44:48 +0200 Subject: [PATCH 2/6] libtirpc: wintirpc.h: Fix VC19 warnings about |strdup()| libtirpc: Fix VC19 warnings about |strdup()| in <wintirpc.h>. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- libtirpc/tirpc/wintirpc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h index 608ee97..051e125 100644 --- a/libtirpc/tirpc/wintirpc.h +++ b/libtirpc/tirpc/wintirpc.h @@ -56,7 +56,10 @@ //#define snprintf _snprintf //#define vsnprintf _vsnprintf #define strcasecmp _stricmp -//#define strdup _strdup +/* ucrt/crtdbg.h might define |strdup()| to |_strdup_dbg()| */ +#ifndef strdup +#define strdup _strdup +#endif #define getpid _getpid #define bcmp memcmp -- 2.39.0 From b9ce08ed1f28c1dfd1805d264e031f5ccd11a270 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 28 Oct 2023 11:36:35 +0200 Subject: [PATCH 3/6] libtirpc: [refix] Use fd number instead of SOCKET handle for locking libtirpc: Use fd number (from |_get_osfhandle()| instead of |SOCKET| handle for locking. Remove usage of |_get_osfhandle()| where |FD_CLR()| wants a socket handle. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- libtirpc/src/svc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtirpc/src/svc.c b/libtirpc/src/svc.c index 2932db7..c975286 100644 --- a/libtirpc/src/svc.c +++ b/libtirpc/src/svc.c @@ -771,7 +771,7 @@ svc_getreq_poll (pfdp, pollretval) if (p->revents & POLLNVAL) { rwlock_wrlock (&svc_fd_lock); - FD_CLR (_get_osfhandle(p->fd), &svc_fdset); + FD_CLR (p->fd, &svc_fdset); rwlock_unlock (&svc_fd_lock); } else -- 2.39.0 From f6f43cdfa5789359cbd543b1fdd30c59a5484b50 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 28 Oct 2023 11:39:00 +0200 Subject: [PATCH 4/6] wintirpc.h: Fix |wintirpc_send()| prototype libtirpc/tirpc/wintirpc.h: Fix |wintirpc_send()| typo in prototype Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- libtirpc/tirpc/wintirpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libtirpc/tirpc/wintirpc.h b/libtirpc/tirpc/wintirpc.h index 051e125..a41c2d7 100644 --- a/libtirpc/tirpc/wintirpc.h +++ b/libtirpc/tirpc/wintirpc.h @@ -105,7 +105,7 @@ int wintirpc_socket(int af,int type, int protocol); int wintirpc_closesocket(int in_fd); int wintirpc_listen(int in_s, int backlog); int wintirpc_accept(int s_fd, struct sockaddr *addr, int *addrlen); -int winntirpc_send(int s, const char *buf, int len, int flags); +int wintirpc_send(int s, const char *buf, int len, int flags); int wintirpc_sendto(int s, const char *buf, int len, int flags, const struct sockaddr *to, int tolen); void wintirpc_register_osfhandle_fd(SOCKET handle, int fd); void wintirpc_unregister_osfhandle(SOCKET handle); -- 2.39.0 From 2cd4d53fc497f7bd46da0216cf9c91f500a832dd Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 28 Oct 2023 12:06:23 +0200 Subject: [PATCH 5/6] daemon/daemon_debug.c: Fix |fprintf()| compiler warnings Fix compiler warnings daemon/daemon_debug.c related to data type and size mismatches and used format strings, e.g. %d for |size_t| where %zd would be correct per POSIX. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/daemon_debug.c | 64 ++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/daemon/daemon_debug.c b/daemon/daemon_debug.c index 40b3d6f..a4ad99d 100644 --- a/daemon/daemon_debug.c +++ b/daemon/daemon_debug.c @@ -227,48 +227,56 @@ void print_share_mode(int level, DWORD mode) void print_file_id_both_dir_info(int level, FILE_ID_BOTH_DIR_INFO *pboth_dir_info) { - if (level > g_debug_level) return; - fprintf(dlog_file, "FILE_ID_BOTH_DIR_INFO %p %d\n", + /* printf %zd is for |size_t| */ + + if (level > g_debug_level) + return; + (void)fprintf(dlog_file, "FILE_ID_BOTH_DIR_INFO %p %zd\n", pboth_dir_info, sizeof(unsigned char *)); - fprintf(dlog_file, "\tNextEntryOffset=%ld %d %d\n", - pboth_dir_info->NextEntryOffset, + (void)fprintf(dlog_file, "\tNextEntryOffset=%ld %zd %zd\n", + pboth_dir_info->NextEntryOffset, sizeof(pboth_dir_info->NextEntryOffset), sizeof(DWORD)); - fprintf(dlog_file, "\tFileIndex=%ld %d\n", pboth_dir_info->FileIndex, + (void)fprintf(dlog_file, "\tFileIndex=%ld %zd\n", + pboth_dir_info->FileIndex, sizeof(pboth_dir_info->FileIndex)); - fprintf(dlog_file, "\tCreationTime=0x%x %d\n", - pboth_dir_info->CreationTime.QuadPart, + (void)fprintf(dlog_file, "\tCreationTime=0x%llx %zd\n", + (long long)pboth_dir_info->CreationTime.QuadPart, sizeof(pboth_dir_info->CreationTime)); - fprintf(dlog_file, "\tLastAccessTime=0x%x %d\n", - pboth_dir_info->LastAccessTime.QuadPart, + (void)fprintf(dlog_file, "\tLastAccessTime=0x%llx %zd\n", + (long long)pboth_dir_info->LastAccessTime.QuadPart, sizeof(pboth_dir_info->LastAccessTime)); - fprintf(dlog_file, "\tLastWriteTime=0x%x %d\n", - pboth_dir_info->LastWriteTime.QuadPart, + (void)fprintf(dlog_file, "\tLastWriteTime=0x%llx %zd\n", + (long long)pboth_dir_info->LastWriteTime.QuadPart, sizeof(pboth_dir_info->LastWriteTime)); - fprintf(dlog_file, "\tChangeTime=0x%x %d\n", - pboth_dir_info->ChangeTime.QuadPart, + (void)fprintf(dlog_file, "\tChangeTime=0x%llx %zd\n", + (long long)pboth_dir_info->ChangeTime.QuadPart, sizeof(pboth_dir_info->ChangeTime)); - fprintf(dlog_file, "\tEndOfFile=0x%x %d\n", - pboth_dir_info->EndOfFile.QuadPart, + (void)fprintf(dlog_file, "\tEndOfFile=0x%llx %zd\n", + (long long)pboth_dir_info->EndOfFile.QuadPart, sizeof(pboth_dir_info->EndOfFile)); - fprintf(dlog_file, "\tAllocationSize=0x%x %d\n", - pboth_dir_info->AllocationSize.QuadPart, + (void)fprintf(dlog_file, "\tAllocationSize=0x%llx %zd\n", + (long long)pboth_dir_info->AllocationSize.QuadPart, sizeof(pboth_dir_info->AllocationSize)); - fprintf(dlog_file, "\tFileAttributes=%ld %d\n", - pboth_dir_info->FileAttributes, + (void)fprintf(dlog_file, "\tFileAttributes=%ld %zd\n", + pboth_dir_info->FileAttributes, sizeof(pboth_dir_info->FileAttributes)); - fprintf(dlog_file, "\tFileNameLength=%ld %d\n", - pboth_dir_info->FileNameLength, + (void)fprintf(dlog_file, "\tFileNameLength=%ld %zd\n", + pboth_dir_info->FileNameLength, sizeof(pboth_dir_info->FileNameLength)); - fprintf(dlog_file, "\tEaSize=%ld %d\n", - pboth_dir_info->EaSize, sizeof(pboth_dir_info->EaSize)); - fprintf(dlog_file, "\tShortNameLength=%d %d\n", - pboth_dir_info->ShortNameLength, + (void)fprintf(dlog_file, "\tEaSize=%ld %zd\n", + pboth_dir_info->EaSize, + sizeof(pboth_dir_info->EaSize)); + (void)fprintf(dlog_file, "\tShortNameLength=%d %zd\n", + pboth_dir_info->ShortNameLength, sizeof(pboth_dir_info->ShortNameLength)); - fprintf(dlog_file, "\tShortName='%S' %d\n", pboth_dir_info->ShortName, + (void)fprintf(dlog_file, "\tShortName='%S' %zd\n", + pboth_dir_info->ShortName, sizeof(pboth_dir_info->ShortName)); - fprintf(dlog_file, "\tFileId=0x%x %d\n", pboth_dir_info->FileId.QuadPart, + (void)fprintf(dlog_file, "\tFileId=0x%llx %zd\n", + (long long)pboth_dir_info->FileId.QuadPart, sizeof(pboth_dir_info->FileId)); - fprintf(dlog_file, "\tFileName='%S' %p\n", pboth_dir_info->FileName, + (void)fprintf(dlog_file, "\tFileName='%S' %p\n", + pboth_dir_info->FileName, pboth_dir_info->FileName); } -- 2.39.0 From 0d5c69660d0a1c63280e6ea0f3082f66e1a6bb04 Mon Sep 17 00:00:00 2001 From: Roland Mainz <roland.mainz@nrubsig.org> Date: Sat, 28 Oct 2023 13:30:40 +0200 Subject: [PATCH 6/6] daemon: Add option nfsd_debug to set number of fs threads (default=32) Add option nfsd_debug option --numworkerthreads to set the number of filesystem worker threads (minimum 16, maximum 1023, default 32). For now we set the default number of worker threads to 32 (from 128) to make debugging a bit easier. Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com> --- daemon/nfs41_daemon.c | 41 ++++++++++++++++++++++++++++++++++++----- daemon/nfs41_daemon.h | 1 + 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c index 00eb971..640e23e 100644 --- a/daemon/nfs41_daemon.c +++ b/daemon/nfs41_daemon.c @@ -35,7 +35,9 @@ #include "upcall.h" #include "util.h" -#define MAX_NUM_THREADS 128 +/* nfs41_dg.num_worker_threads sets the actual number of worker threads */ +#define MAX_NUM_THREADS 1024 +#define DEFAULT_NUM_THREADS 32 DWORD NFS41D_VERSION = 0; static const char FILE_NETCONFIG[] = "C:\\etc\\netconfig"; @@ -44,6 +46,7 @@ static const char FILE_NETCONFIG[] = "C:\\etc\\netconfig"; nfs41_daemon_globals nfs41_dg = { .default_uid = NFS_USER_NOBODY_UID, .default_gid = NFS_GROUP_NOGROUP_GID, + .num_worker_threads = DEFAULT_NUM_THREADS, }; @@ -181,8 +184,12 @@ static bool_t check_for_files() static void PrintUsage() { - fprintf(stderr, "Usage: nfsd.exe -d <debug_level> --noldap " - "--uid <non-zero value> --gid\n"); + (void)fprintf(stderr, "Usage: nfsd.exe -d <debug_level> " + "--noldap " + "--uid <non-zero value> " + "--gid <non-zero value> " + "--numworkerthreads <value-between 16 and %d> " + "\n", MAX_NUM_THREADS); } static bool_t parse_cmdlineargs(int argc, TCHAR *argv[], nfsd_args *out) { @@ -234,6 +241,28 @@ static bool_t parse_cmdlineargs(int argc, TCHAR *argv[], nfsd_args *out) } nfs41_dg.default_gid = _ttoi(argv[i]); } + else if (_tcscmp(argv[i], TEXT("--numworkerthreads")) == 0) { + ++i; + if (i >= argc) { + fprintf(stderr, "Missing value for num_worker_threads\n"); + PrintUsage(); + return FALSE; + } + nfs41_dg.num_worker_threads = _ttoi(argv[i]); + if (nfs41_dg.num_worker_threads < 16) { + fprintf(stderr, "--numworkerthreads requires at least 16 worker threads\n"); + PrintUsage(); + return FALSE; + } + if (nfs41_dg.num_worker_threads >= MAX_NUM_THREADS) { + fprintf(stderr, + "--numworkerthreads supports a maximum of " + "%d worker threads\n", + MAX_NUM_THREADS); + PrintUsage(); + return FALSE; + } + } else fprintf(stderr, "Unrecognized option '%s', disregarding.\n", argv[i]); } @@ -442,7 +471,9 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) goto out_pipe; #endif - for (i = 0; i < MAX_NUM_THREADS; i++) { + dprintf(1, "Starting %d worker threads...\n", + (int)nfs41_dg.num_worker_threads); + for (i = 0; i < nfs41_dg.num_worker_threads; i++) { tids[i].handle = (HANDLE)_beginthreadex(NULL, 0, thread_main, &nfs41_dg, 0, &tids[i].tid); if (tids[i].handle == INVALID_HANDLE_VALUE) { @@ -459,7 +490,7 @@ VOID ServiceStart(DWORD argc, LPTSTR *argv) #else //This can be changed to waiting on an array of handles and using waitformultipleobjects dprintf(1, "Parent waiting for children threads\n"); - for (i = 0; i < MAX_NUM_THREADS; i++) + for (i = 0; i < nfs41_dg.num_worker_threads; i++) WaitForSingleObject(tids[i].handle, INFINITE ); #endif dprintf(1, "Parent woke up!!!!\n"); diff --git a/daemon/nfs41_daemon.h b/daemon/nfs41_daemon.h index f58ce79..2023fdc 100644 --- a/daemon/nfs41_daemon.h +++ b/daemon/nfs41_daemon.h @@ -34,6 +34,7 @@ typedef struct __nfs41_daemon_globals { char localdomain_name[NFS41_HOSTNAME_LEN]; int default_uid; int default_gid; + ssize_t num_worker_threads; } nfs41_daemon_globals; #endif /* !__NFS41_DAEMON_H_ */ -- 2.39.0

Title:

Privacy: Public Private

How long should your post be retained?

15 mins an hour a day a week a month forever