diff options
Diffstat (limited to 'support/nfs')
| -rw-r--r-- | support/nfs/rpcmisc.c | 19 | ||||
| -rw-r--r-- | support/nfs/svc_create.c | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c index b73187a..64c98ff 100644 --- a/support/nfs/rpcmisc.c +++ b/support/nfs/rpcmisc.c @@ -39,7 +39,7 @@ #define _RPCSVC_CLOSEDOWN 120 int _rpcpmstart = 0; -int _rpcfdtype = 0; +unsigned int _rpcprotobits = (NFSCTL_UDPBIT|NFSCTL_TCPBIT); int _rpcsvcdirty = 0; static void @@ -51,7 +51,7 @@ closedown(int sig) static int size; int i, openfd; - if (_rpcfdtype == SOCK_DGRAM) + if (NFSCTL_TCPISSET(_rpcprotobits) == 0) exit(0); if (size == 0) @@ -130,7 +130,16 @@ rpc_init(char *name, int prog, int vers, * listen will fail on a connected TCP socket(passed by rsh). */ if (!(fdtype == SOCK_STREAM && listen(0,5) == -1)) { - _rpcfdtype = fdtype; + switch(fdtype) { + case SOCK_DGRAM: + NFSCTL_UDPSET(_rpcprotobits); + break; + case SOCK_STREAM: + NFSCTL_TCPSET(_rpcprotobits); + break; + default: + xlog(L_FATAL, "getsockopt returns bad socket type: %d", fdtype); + } _rpcpmstart = 1; } } @@ -139,7 +148,7 @@ rpc_init(char *name, int prog, int vers, sock = RPC_ANYSOCK; } - if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_DGRAM)) { + if (NFSCTL_UDPISSET(_rpcprotobits)) { static SVCXPRT *last_transp = NULL; if (_rpcpmstart == 0) { @@ -167,7 +176,7 @@ rpc_init(char *name, int prog, int vers, last_transp = transp; } - if ((_rpcfdtype == 0) || (_rpcfdtype == SOCK_STREAM)) { + if (NFSCTL_TCPISSET(_rpcprotobits)) { static SVCXPRT *last_transp = NULL; if (_rpcpmstart == 0) { diff --git a/support/nfs/svc_create.c b/support/nfs/svc_create.c index c159fc8..9ae2965 100644 --- a/support/nfs/svc_create.c +++ b/support/nfs/svc_create.c @@ -29,6 +29,7 @@ #include <unistd.h> #include <errno.h> #include <netdb.h> +#include "nfslib.h" #include <netinet/in.h> @@ -417,6 +418,10 @@ nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version, if (!(nconf->nc_flag & NC_VISIBLE)) continue; visible++; + + if (!strcmp(nconf->nc_proto, NC_TCP) && !NFSCTL_TCPISSET(_rpcprotobits)) + continue; + if (port == 0) servport = getservport(program, nconf->nc_proto); else |