mount.nfs: clean up getport() function

[nfs-utils.git] / utils / mount / network.c

diff --git a/utils/mount/network.c b/utils/mount/network.c
index b04491c7e38605c8a0056803eb4bea962d4eccef..c997c4cc0ee30e86d482bd23c4cc7646d53c5a49 100644 (file)
--- 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"
@@ -122,42 +121,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 +386,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 +408,24 @@ 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;
        }
- out_bad:
-       return res;
+
+       if (res == RPC_SUCCESS)
+               return 1;
+       return 0;
 }