mount command: Replace clnt_ping() and getport() calls in probe_port()

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 2db694d2541bb1a8acfe8d3956bbc14d1de8a84f..8d96e127d112ec09ef3a1a20afb93a982c3b6ace 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -36,6 +36,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 #include <rpc/rpc.h>
 #include <rpc/pmap_prot.h>
@@ -46,6 +47,7 @@
 #include "nls.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
+#include "nfsrpc.h"
 #include "network.h"
 
 /*
@@ -78,6 +80,11 @@ extern int nfs_mount_data_version;
 extern char *progname;
 extern int verbose;
 
+static const char *nfs_ns_pgmtbl[] = {
+       "status",
+       NULL,
+};
+
 static const unsigned long nfs_to_mnt[] = {
        0,
        0,
@@ -514,6 +521,27 @@ static unsigned short getport(struct sockaddr_in *saddr,
        return port;
 }
 
+static void nfs_pp_debug(const struct sockaddr *sap, const socklen_t salen,
+                        const rpcprog_t program, const rpcvers_t version,
+                        const unsigned short protocol,
+                        const unsigned short port)
+{
+       char buf[NI_MAXHOST];
+
+       if (!verbose)
+               return;
+
+       if (nfs_present_sockaddr(sap, salen, buf, sizeof(buf)) == 0) {
+               buf[0] = '\0';
+               strcat(buf, "unknown host");
+       }
+
+       fprintf(stderr, _("%s: trying %s prog %ld vers %ld prot %s port %d\n"),
+                       progname, buf, program, version,
+                       (protocol == IPPROTO_UDP ? _("UDP") : _("TCP")),
+                       port);
+}
+
 /*
  * Use the portmapper to discover whether or not the service we want is
  * available. The lists 'versions' and 'protos' define ordered sequences
@@ -522,7 +550,8 @@ static unsigned short getport(struct sockaddr_in *saddr,
 static int probe_port(clnt_addr_t *server, const unsigned long *versions,
                        const unsigned int *protos)
 {
-       struct sockaddr_in *saddr = &server->saddr;
+       const struct sockaddr *saddr = (struct sockaddr *)&server->saddr;
+       const socklen_t salen = sizeof(server->saddr);
        struct pmap *pmap = &server->pmap;
        const unsigned long prog = pmap->pm_prog, *p_vers;
        const unsigned int prot = (u_int)pmap->pm_prot, *p_prot;
@@ -534,21 +563,14 @@ static int probe_port(clnt_addr_t *server, const unsigned long *versions,
        p_vers = vers ? &vers : versions;
        rpc_createerr.cf_stat = 0;
        for (;;) {
-               p_port = getport(saddr, prog, *p_vers, *p_prot);
+               p_port = nfs_getport(saddr, salen, prog, *p_vers, *p_prot);
                if (p_port) {
                        if (!port || port == p_port) {
-                               saddr->sin_port = htons(p_port);
-                               if (verbose) {
-                                       printf(_("%s: trying %s prog %ld vers "
-                                               "%ld prot %s port %d\n"),
-                                               progname,
-                                               inet_ntoa(saddr->sin_addr),
-                                               prog, *p_vers,
-                                               *p_prot == IPPROTO_UDP ?
-                                                       _("UDP") : _("TCP"),
-                                               p_port);
-                                }
-                               if (clnt_ping(saddr, prog, *p_vers, *p_prot, NULL))
+                               server->saddr.sin_port = htons(p_port);
+                               nfs_pp_debug(saddr, salen, prog, *p_vers,
+                                               *p_prot, p_port);
+                               if (nfs_rpc_ping(saddr, salen, prog,
+                                                       *p_vers, *p_prot, NULL))
                                        goto out_ok;
                        }
                }
@@ -668,24 +690,16 @@ version_fixed:
        return probe_mntport(mnt_server);
 }
 
-static int probe_statd(void)
+static int nfs_probe_statd(void)
 {
-       struct sockaddr_in addr;
-       unsigned short port;
-
-       memset(&addr, 0, sizeof(addr));
-       addr.sin_family = AF_INET;
-       addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-       port = getport(&addr, 100024, 1, IPPROTO_UDP);
-
-       if (port == 0)
-               return 0;
-       addr.sin_port = htons(port);
-
-       if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0)
-               return 0;
+       struct sockaddr_in addr = {
+               .sin_family             = AF_INET,
+               .sin_addr.s_addr        = htonl(INADDR_LOOPBACK),
+       };
+       rpcprog_t program = nfs_getrpcbyname(NSMPROG, nfs_ns_pgmtbl);
 
-       return 1;
+       return nfs_getport_ping((struct sockaddr *)&addr, sizeof(addr),
+                               program, (rpcvers_t)1, IPPROTO_UDP);
 }
 
 /**
@@ -699,14 +713,26 @@ int start_statd(void)
        struct stat stb;
 #endif
 
-       if (probe_statd())
+       if (nfs_probe_statd())
                return 1;
 
 #ifdef START_STATD
        if (stat(START_STATD, &stb) == 0) {
                if (S_ISREG(stb.st_mode) && (stb.st_mode & S_IXUSR)) {
-                       system(START_STATD);
-                       if (probe_statd())
+                       pid_t pid = fork();
+                       switch (pid) {
+                       case 0: /* child */
+                               execl(START_STATD, START_STATD, NULL);
+                               exit(1);
+                       case -1: /* error */
+                               nfs_error(_("fork failed: %s"),
+                                                       strerror(errno));
+                               break;
+                       default: /* parent */
+                               waitpid(pid, NULL,0);
+                               break;
+                       }
+                       if (nfs_probe_statd())
                                return 1;
                }
        }