summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-09-28 16:36:40 -0400
committerNeil Brown <neilb@suse.de>2007-09-29 07:58:57 +1000
commit83efd7ddb50cac2f0cf4887e7c54991b4cdcc635 (patch)
tree03803297609b0eed79e1b832af09ada1a7e5c7b1
parent2ab6ed792a773751d1f5d60d13a06161559c0e54 (diff)
downloadnfs-utils-83efd7ddb50cac2f0cf4887e7c54991b4cdcc635.tar.gz
nfs-utils-83efd7ddb50cac2f0cf4887e7c54991b4cdcc635.tar.xz
nfs-utils-83efd7ddb50cac2f0cf4887e7c54991b4cdcc635.zip
text-based mount.nfs: Use new parser to handle 'addr=' and 'clientaddr='
Introduce, but don't yet use, functions that will eventually replace append_addr_opt() and append_clientaddr_opt(). Note the behavioral change in append_addr_opt() -- it simply removes any previous 'addr=' rather than throwing an error. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--utils/mount/stropts.c55
1 files changed, 55 insertions, 0 deletions
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index f73521f..b2e8d2f 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -40,6 +40,7 @@
#include "stropts.h"
#include "error.h"
#include "network.h"
+#include "parse_opt.h"
#ifdef HAVE_RPCSVC_NFS_PROT_H
#include <rpcsvc/nfs_prot.h>
@@ -235,6 +236,60 @@ static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
}
/*
+ * Append the 'addr=' option to the options string to pass a resolved
+ * server address to the kernel. After a successful mount, this address
+ * is also added to /etc/mtab for use when unmounting.
+ *
+ * If 'addr=' is already present, we strip it out. This prevents users
+ * from setting a bogus 'addr=' option themselves, and also allows bg
+ * retries to recompute the server's address, in case it has changed.
+ *
+ * Returns 1 if 'addr=' option appended successfully;
+ * otherwise zero.
+ */
+static int append_addr_option(struct sockaddr_in *saddr,
+ 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;
+}
+
+/*
+ * Called to discover our address and append an appropriate 'clientaddr='
+ * option to the options string.
+ *
+ * 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)
+{
+ struct sockaddr_in my_addr;
+ char new_option[32];
+
+ if (po_contains(options, "clientaddr") == PO_SUCCEEDED)
+ return 1;
+
+ if (!get_client_address(saddr, &my_addr))
+ return 0;
+
+ 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;
+}
+
+/*
* nfsmount_s - Mount an NFSv2 or v3 file system using C string options
*
* @spec: C string hostname:path specifying remoteshare to mount