Change the append_clientaddr_option() function to support sending either

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

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 34b4134076cf1faa8aa7bd54e6665549338a4ca7..ff516523d2389ddd05b48110df2cb30ff96f4df5 100644 (file)
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -33,8 +33,11 @@
 #include <errno.h>
 #include <netdb.h>
 #include <time.h>
+
 #include <sys/socket.h>
 #include <sys/mount.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "xcommon.h"
 #include "mount.h"
@@ -191,6 +194,37 @@ static time_t nfs_parse_retry_option(struct mount_options *options,
        return time(NULL) + (time_t)(timeout_minutes * 60);
 }
 
+/*
+ * Convert the passed-in sockaddr-style address to presentation
+ * format, then append an option of the form "keyword=address".
+ *
+ * Returns 1 if the option was appended successfully; otherwise zero.
+ */
+static int nfs_append_generic_address_option(const struct sockaddr *sap,
+                                            const socklen_t salen,
+                                            const char *keyword,
+                                            struct mount_options *options)
+{
+       char address[NI_MAXHOST];
+       char new_option[512];
+
+       if (!nfs_present_sockaddr(sap, salen, address, sizeof(address)))
+               goto out_err;
+
+       if (snprintf(new_option, sizeof(new_option), "%s=%s",
+                                       keyword, address) >= sizeof(new_option))
+               goto out_err;
+
+       if (po_append(options, new_option) != PO_SUCCEEDED)
+               goto out_err;
+
+       return 1;
+
+out_err:
+       nfs_error(_("%s: failed to construct %s option"), progname, keyword);
+       return 0;
+}
+
 /*
  * Append the 'addr=' option to the options string to pass a resolved
  * server address to the kernel.  After a successful mount, this address
@@ -203,19 +237,12 @@ static time_t nfs_parse_retry_option(struct mount_options *options,
  * Returns 1 if 'addr=' option appended successfully;
  * otherwise zero.
  */
-static int append_addr_option(struct sockaddr_in *saddr,
-                          struct mount_options *options)
+static int nfs_append_addr_option(const struct sockaddr *sap,
+                                 socklen_t salen,
+                                 struct mount_options *options)
 {
-       char new_option[24];
-
        po_remove_all(options, "addr");
-
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "addr=%s", inet_ntoa(saddr->sin_addr));
-
-       if (po_append(options, new_option) == PO_SUCCEEDED)
-               return 1;
-       return 0;
+       return nfs_append_generic_address_option(sap, salen, "addr", options);
 }
 
 /*
@@ -225,24 +252,21 @@ static int append_addr_option(struct sockaddr_in *saddr,
  * Returns 1 if 'clientaddr=' option created successfully or if
  * 'clientaddr=' option is already present; otherwise zero.
  */
-static int append_clientaddr_option(struct sockaddr_in *saddr,
-                                   struct mount_options *options)
+static int nfs_append_clientaddr_option(const struct sockaddr *sap,
+                                       socklen_t salen,
+                                       struct mount_options *options)
 {
-       struct sockaddr_in my_addr;
-       char new_option[32];
+       struct sockaddr_storage dummy;
+       struct sockaddr *my_addr = (struct sockaddr *)&dummy;
+       socklen_t my_len = sizeof(dummy);
 
-       if (po_contains(options, "clientaddr") == PO_SUCCEEDED)
+       if (po_contains(options, "clientaddr") == PO_FOUND)
                return 1;
 
-       if (!get_client_address(saddr, &my_addr))
-               return 0;
+       nfs_callback_address(sap, salen, my_addr, &my_len);
 
-       snprintf(new_option, sizeof(new_option) - 1,
-                       "clientaddr=%s", inet_ntoa(my_addr.sin_addr));
-
-       if (po_append(options, new_option) == PO_SUCCEEDED)
-               return 1;
-       return 0;
+       return nfs_append_generic_address_option(my_addr, my_len,
+                                                       "clientaddr", options);
 }
 
 /*
@@ -312,7 +336,8 @@ static int nfs_validate_options(struct nfsmount_info *mi)
                return 0;
 
        if (strncmp(mi->type, "nfs4", 4) == 0) {
-               if (!append_clientaddr_option(&saddr, mi->options))
+               if (!nfs_append_clientaddr_option((struct sockaddr *)&saddr,
+                                                 sizeof(saddr), mi->options))
                        return 0;
        } else {
                if (!fix_mounthost_option(mi->options))
@@ -324,10 +349,8 @@ static int nfs_validate_options(struct nfsmount_info *mi)
        if (!nfs_append_sloppy_option(mi->options))
                return 0;
 
-       if (!append_addr_option(&saddr, mi->options))
-               return 0;
-
-       return 1;
+       return nfs_append_addr_option((struct sockaddr *)&saddr,
+                                       sizeof(saddr), mi->options);
 }
 
 /*