X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.c;h=c092571044b0c31d61cec3f7862c16a93c8f8650;hp=b04491c7e38605c8a0056803eb4bea962d4eccef;hb=b6e4ddd10b3c67ef210e572dec956cb35ce96440;hpb=a4b10d48a730fbc6ff62197facddccdf7e204610 diff --git a/utils/mount/network.c b/utils/mount/network.c index b04491c..c092571 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -38,7 +38,6 @@ #include "xcommon.h" #include "mount.h" #include "nls.h" -#include "nfsumount.h" #include "nfs_mount.h" #include "mount_constants.h" #include "network.h" @@ -58,6 +57,40 @@ extern int nfs_mount_data_version; extern char *progname; extern int verbose; +static const unsigned long nfs_to_mnt[] = { + 0, + 0, + 1, + 3, +}; + +static const unsigned long mnt_to_nfs[] = { + 0, + 2, + 2, + 3, +}; + +/* + * Map an NFS version into the corresponding Mountd version + */ +unsigned long nfsvers_to_mnt(const unsigned long vers) +{ + if (vers <= 3) + return nfs_to_mnt[vers]; + return 0; +} + +/* + * Map a Mountd version into the corresponding NFS version + */ +static unsigned long mntvers_to_nfs(const unsigned long vers) +{ + if (vers <= 3) + return mnt_to_nfs[vers]; + return 0; +} + static const unsigned int probe_udp_only[] = { IPPROTO_UDP, 0, @@ -122,42 +155,66 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr) } /* - * getport() is very similar to pmap_getport() with - * the exception this version uses a non-reserve ports - * instead of reserve ports since reserve ports - * are not needed for pmap requests. + * getport() is very similar to pmap_getport() with the exception that + * this version tries to use an ephemeral port, since reserved ports are + * not needed for GETPORT queries. This conserves the very limited + * reserved port space, which helps reduce failed socket binds + * during mount storms. + * + * A side effect of calling this function is that rpccreateerr is set. */ -unsigned short getport(struct sockaddr_in *saddr, unsigned long prog, - unsigned long vers, unsigned int prot) +static unsigned short getport(struct sockaddr_in *saddr, + unsigned long program, + unsigned long version, + unsigned int proto) { unsigned short port = 0; int socket; CLIENT *clnt = NULL; - struct pmap parms; enum clnt_stat stat; - saddr->sin_port = htons (PMAPPORT); - socket = get_socket(saddr, prot, FALSE, FALSE); + saddr->sin_port = htons(PMAPPORT); + + /* + * Try to get a socket with a non-privileged port. + * clnt*create() will create one anyway if this + * fails. + */ + socket = get_socket(saddr, proto, FALSE, FALSE); + if (socket == RPC_ANYSOCK) { + if (proto == IPPROTO_TCP && errno == ETIMEDOUT) { + /* + * TCP SYN timed out, so exit now. + */ + rpc_createerr.cf_stat = RPC_TIMEDOUT; + } + return 0; + } - switch (prot) { + switch (proto) { case IPPROTO_UDP: clnt = clntudp_bufcreate(saddr, - PMAPPROG, PMAPVERS, TIMEOUT, &socket, - UDPMSGSIZE, UDPMSGSIZE); + PMAPPROG, PMAPVERS, + RETRY_TIMEOUT, &socket, + RPCSMALLMSGSIZE, + RPCSMALLMSGSIZE); break; case IPPROTO_TCP: - clnt = clnttcp_create(saddr, - PMAPPROG, PMAPVERS, &socket, 50, 500); + clnt = clnttcp_create(saddr, PMAPPROG, PMAPVERS, &socket, + RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); break; } if (clnt != NULL) { - parms.pm_prog = prog; - parms.pm_vers = vers; - parms.pm_prot = prot; - parms.pm_port = 0; /* not needed or used */ - - stat = clnt_call(clnt, PMAPPROC_GETPORT, (xdrproc_t)xdr_pmap, - (caddr_t)&parms, (xdrproc_t)xdr_u_short, (caddr_t)&port, TIMEOUT); + struct pmap parms = { + .pm_prog = program, + .pm_vers = version, + .pm_prot = proto, + }; + + stat = clnt_call(clnt, PMAPPROC_GETPORT, + (xdrproc_t)xdr_pmap, (caddr_t)&parms, + (xdrproc_t)xdr_u_short, (caddr_t)&port, + TIMEOUT); if (stat) { clnt_geterr(clnt, &rpc_createerr.cf_error); rpc_createerr.cf_stat = stat; @@ -363,6 +420,17 @@ int start_statd(void) return 0; } +/* + * nfs_call_umount - ask the server to remove a share from it's rmtab + * @mnt_server: address of RPC MNT program server + * @argp: directory path of share to "unmount" + * + * Returns one if the unmount call succeeded; zero if the unmount + * failed for any reason. + * + * Note that a side effect of calling this function is that rpccreateerr + * is set. + */ int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) { CLIENT *clnt; @@ -374,22 +442,71 @@ int nfs_call_umount(clnt_addr_t *mnt_server, dirpath *argp) case 2: case 1: if (!probe_mntport(mnt_server)) - goto out_bad; + return 0; clnt = mnt_openclnt(mnt_server, &msock); if (!clnt) - goto out_bad; + return 0; res = clnt_call(clnt, MOUNTPROC_UMNT, - (xdrproc_t) xdr_dirpath, (caddr_t)argp, - (xdrproc_t) xdr_void, NULL, + (xdrproc_t)xdr_dirpath, (caddr_t)argp, + (xdrproc_t)xdr_void, NULL, TIMEOUT); mnt_closeclnt(clnt, msock); if (res == RPC_SUCCESS) return 1; break; default: - res = 1; + res = RPC_SUCCESS; + break; + } + + if (res == RPC_SUCCESS) + return 1; + return 0; +} + +CLIENT *mnt_openclnt(clnt_addr_t *mnt_server, int *msock) +{ + struct sockaddr_in *mnt_saddr = &mnt_server->saddr; + struct pmap *mnt_pmap = &mnt_server->pmap; + CLIENT *clnt = NULL; + + mnt_saddr->sin_port = htons((u_short)mnt_pmap->pm_port); + *msock = get_socket(mnt_saddr, mnt_pmap->pm_prot, TRUE, FALSE); + if (*msock == RPC_ANYSOCK) { + if (rpc_createerr.cf_error.re_errno == EADDRINUSE) + /* + * Probably in-use by a TIME_WAIT connection, + * It is worth waiting a while and trying again. + */ + rpc_createerr.cf_stat = RPC_TIMEDOUT; + return NULL; + } + + switch (mnt_pmap->pm_prot) { + case IPPROTO_UDP: + clnt = clntudp_bufcreate(mnt_saddr, + mnt_pmap->pm_prog, mnt_pmap->pm_vers, + RETRY_TIMEOUT, msock, + MNT_SENDBUFSIZE, MNT_RECVBUFSIZE); + break; + case IPPROTO_TCP: + clnt = clnttcp_create(mnt_saddr, + mnt_pmap->pm_prog, mnt_pmap->pm_vers, + msock, + MNT_SENDBUFSIZE, MNT_RECVBUFSIZE); break; } - out_bad: - return res; + if (clnt) { + /* try to mount hostname:dirname */ + clnt->cl_auth = authunix_create_default(); + return clnt; + } + return NULL; +} + +void mnt_closeclnt(CLIENT *clnt, int msock) +{ + auth_destroy(clnt->cl_auth); + clnt_destroy(clnt); + close(msock); }