showmount command: support querying IPv6 servers

Introduce a version of nfs_get_mount_client() that supports AF_INET6 and
AF_INET server addresses.  If the TI-RPC library is not available when
the showmount command is built, fall back to the legacy RPC user-space
API.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 7f5ad3aa54fc79138f0c7cf92c0ea6d4c52fa72b..17f7d87102b429896b1ef936daafa065e136e7f4 100644 (file)
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -50,6 +50,13 @@ static int   aflag = 0;
 static int     dflag = 0;
 static int     eflag = 0;
 
 static int     dflag = 0;
 static int     eflag = 0;
 

+static const char *nfs_sm_pgmtbl[] = {
+       "showmount",
+       "mount",
+       "mountd",
+       NULL,
+};
+

 static struct option longopts[] =
 {
        { "all", 0, 0, 'a' },
 static struct option longopts[] =
 {
        { "all", 0, 0, 'a' },


@@ -78,6 +85,33 @@ static void usage(FILE *fp, int n)
        exit(n);
 }
 
        exit(n);
 }
 

+#ifdef HAVE_CLNT_CREATE
+
+/*
+ * 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);
+}
+
+#else  /* HAVE_CLNT_CREATE */
+

 /*
  *  Perform a non-blocking connect on the socket fd.
  *
 /*
  *  Perform a non-blocking connect on the socket fd.
  *


@@ -213,6 +247,8 @@ static CLIENT *nfs_get_mount_client(const char *hostname)
        return mclient;
 }
 
        return mclient;
 }
 

+#endif /* HAVE_CLNT_CREATE */
+

 int main(int argc, char **argv)
 {
        char hostname_buf[MAXHOSTLEN];
 int main(int argc, char **argv)
 {
        char hostname_buf[MAXHOSTLEN];