NFS man page: update nfs(5) with details about IPv6 support

[nfs-utils.git] / utils / showmount / showmount.c

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 47b58255a285a2af1338c59f2d6f8ea5bd54f3b5..418e8b9e4f9d3d233dda3a241f1fa69e2d58582d 100644 (file)
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -13,10 +13,13 @@
  * GNU General Public License for more details.
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdio.h>
 #include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>
@@ -25,6 +28,7 @@
 #include <unistd.h>
 #include <memory.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #include <netdb.h>
 #include <arpa/inet.h>
@@ -33,6 +37,11 @@
 #include <mount.h>
 #include <unistd.h>
 
+#include "nfsrpc.h"
+
+#define TIMEOUT_UDP    3
+#define TOTAL_TIMEOUT  20
+
 static char *  version = "showmount for " VERSION;
 static char *  program_name;
 static int     headers = 1;
@@ -54,16 +63,14 @@ static struct option longopts[] =
 
 #define MAXHOSTLEN 256
 
-int dump_cmp(p, q)
-char **p;
-char **q;
+static int dump_cmp(const void *pv, const void *qv)
 {
+       const char **p = (const char **)pv;
+       const char **q = (const char **)qv;
        return strcmp(*p, *q);
 }
 
-static void usage(fp, n)
-FILE *fp;
-int n;
+static void usage(FILE *fp, int n)
 {
        fprintf(fp, "Usage: %s [-adehv]\n", program_name);
        fprintf(fp, "       [--all] [--directories] [--exports]\n");
@@ -71,18 +78,42 @@ int n;
        exit(n);
 }
 
-int main(argc, argv)
-int argc;
-char **argv;
+static const char *nfs_sm_pgmtbl[] = {
+       "showmount",
+       "mount",
+       "mountd",
+       NULL,
+};
+
+/*
+ * Generate an RPC client handle connected to the mountd service
+ * at @hostname, or die trying.
+ *
+ * Supports both AF_INET and AF_INET6 server addresses.
+ */
+static CLIENT *nfs_get_mount_client(const char *hostname)
+{
+       rpcprog_t program = nfs_getrpcbyname(MOUNTPROG, nfs_sm_pgmtbl);
+       CLIENT *client;
+
+       client = clnt_create(hostname, program, MOUNTVERS, "tcp");
+       if (client)
+               return client;
+
+       client = clnt_create(hostname, program, MOUNTVERS, "udp");
+       if (client)
+               return client;
+
+       clnt_pcreateerror("clnt_create");
+       exit(1);
+}
+
+int main(int argc, char **argv)
 {
        char hostname_buf[MAXHOSTLEN];
        char *hostname;
        enum clnt_stat clnt_stat;
-       struct hostent *hp;
-       struct sockaddr_in server_addr;
-       int msock;
        struct timeval total_timeout;
-       struct timeval pertry_timeout;
        int c;
        CLIENT *mclient;
        groups grouplist;
@@ -154,48 +185,21 @@ char **argv;
                break;
        }
 
-       if (hostname[0] >= '0' && hostname[0] <= '9') {
-               server_addr.sin_family = AF_INET;
-               server_addr.sin_addr.s_addr = inet_addr(hostname);
-       }
-       else {
-               if ((hp = gethostbyname(hostname)) == NULL) {
-                       fprintf(stderr, "%s: can't get address for %s\n",
-                               program_name, hostname);
-                       exit(1);
-               }
-               server_addr.sin_family = AF_INET;
-               memcpy(&server_addr.sin_addr, hp->h_addr, hp->h_length);
-       }
-
-       /* create mount deamon client */
-
-       server_addr.sin_port = 0;
-       msock = RPC_ANYSOCK;
-       if ((mclient = clnttcp_create(&server_addr,
-           MOUNTPROG, MOUNTVERS, &msock, 0, 0)) == NULL) {
-               server_addr.sin_port = 0;
-               msock = RPC_ANYSOCK;
-               pertry_timeout.tv_sec = 3;
-               pertry_timeout.tv_usec = 0;
-               if ((mclient = clntudp_create(&server_addr,
-                   MOUNTPROG, MOUNTVERS, pertry_timeout, &msock)) == NULL) {
-                       clnt_pcreateerror("mount clntudp_create");
-                       exit(1);
-               }
-       }
+       mclient = nfs_get_mount_client(hostname);
        mclient->cl_auth = authunix_create_default();
-       total_timeout.tv_sec = 20;
+       total_timeout.tv_sec = TOTAL_TIMEOUT;
        total_timeout.tv_usec = 0;
 
        if (eflag) {
                memset(&exportlist, '\0', sizeof(exportlist));
+
                clnt_stat = clnt_call(mclient, MOUNTPROC_EXPORT,
                        (xdrproc_t) xdr_void, NULL,
                        (xdrproc_t) xdr_exports, (caddr_t) &exportlist,
                        total_timeout);
                if (clnt_stat != RPC_SUCCESS) {
                        clnt_perror(mclient, "rpc mount export");
+                       clnt_destroy(mclient);
                        exit(1);
                }
                if (headers)
@@ -219,6 +223,7 @@ char **argv;
                        printf("\n");
                        exportlist = exportlist->ex_next;
                }
+               clnt_destroy(mclient);
                exit(0);
        }
 
@@ -229,8 +234,10 @@ char **argv;
                total_timeout);
        if (clnt_stat != RPC_SUCCESS) {
                clnt_perror(mclient, "rpc mount dump");
+               clnt_destroy(mclient);
                exit(1);
        }
+       clnt_destroy(mclient);
 
        n = 0;
        for (list = dumplist; list; list = list->ml_next)