X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=b2e8d2f351cf9680574f3f24a690927e8341a217;hp=bd6e60dd3d51e2eaeaeac181043b8a2c577c0c2f;hb=83efd7ddb50cac2f0cf4887e7c54991b4cdcc635;hpb=1545835aa9dc100b0fedaeaf71e716d12e25b439

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index bd6e60d..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>
@@ -140,31 +141,6 @@ static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
 	return 1;
 }
 
-/*
- * XXX: This should really use the technique neil recently added
- * to get the address off the local end of a socket connected to
- * the server -- to get the right address to use on multi-homed
- * clients
- */
-static int get_my_ipv4addr(char *ip_addr, int len)
-{
-	char myname[1024];
-	struct sockaddr_in myaddr;
-
-	if (gethostname(myname, sizeof(myname))) {
-		nfs_error(_("%s: can't determine client address\n"),
-				progname);
-		return 0;
-	}
-	if (!fill_ipv4_sockaddr(myname, &myaddr))
-		return 0;
-
-	snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr));
-	ip_addr[len - 1] = '\0';
-
-	return 1;
-}
-
 /*
  * Walk through our mount options string, and indicate the presence
  * of 'bg', 'retry=', 'addr=', and 'clientaddr='.
@@ -204,27 +180,17 @@ static void extract_interesting_options(char *opts)
  * Returns 1 if 'addr=' option created successfully;
  * otherwise zero.
  */
-static int append_addr_opt(const char *spec, char **extra_opts)
+static int append_addr_opt(struct sockaddr_in *saddr, char **extra_opts)
 {
 	static char new_opts[1024];
-	char *hostname, *s, *old_opts;
-	struct sockaddr_in addr;
-	int err;
-
-	if (!parse_devname(spec, &hostname))
-		return 0;
+	char *s, *old_opts;
 
-	err = fill_ipv4_sockaddr(hostname, &addr);
-	free(hostname);
-	if (!err)
-		return 0;
-
-	s = inet_ntoa(addr.sin_addr);
+	s = inet_ntoa(saddr->sin_addr);
 	old_opts = *extra_opts;
 	if (!old_opts)
 		old_opts = "";
 	if (strlen(old_opts) + strlen(s) + 10 >= sizeof(new_opts)) {
-		nfs_error(_("%s: excessively long option argument\n"),
+		nfs_error(_("%s: too many mount options\n"),
 				progname);
 		return 0;
 	}
@@ -236,22 +202,23 @@ static int append_addr_opt(const char *spec, char **extra_opts)
 }
 
 /*
- * Append the 'clientaddr=' option to the options string.
+ * Called if no 'clientaddr=' option was specified in the options string
+ * to discover our address and append an appropriate 'clientaddr=' option
+ * to the options string.
  *
  * Returns 1 if 'clientaddr=' option created successfully;
  * otherwise zero.
  */
-static int append_clientaddr_opt(const char *spec, char **extra_opts)
+static int append_clientaddr_opt(struct sockaddr_in *saddr, char **extra_opts)
 {
-	static char new_opts[1024], cbuf[1024];
-	static char ip_addr[16] = "127.0.0.1";
+	static char new_opts[2048], cbuf[256];
+	struct sockaddr_in my_addr;
 
-	if (!get_my_ipv4addr(ip_addr, sizeof(ip_addr)))
+	if (!get_client_address(saddr, &my_addr))
 		return 0;
 
-	/* Ensure we have enough padding for the following strcat()s */
-	if (strlen(*extra_opts) + strlen(ip_addr) + 10 >= sizeof(new_opts)) {
-		nfs_error(_("%s: excessively long option argument"),
+	if (strlen(*extra_opts) + 30 >= sizeof(new_opts)) {
+		nfs_error(_("%s: too many mount options"),
 				progname);
 		return 0;
 	}
@@ -259,7 +226,8 @@ static int append_clientaddr_opt(const char *spec, char **extra_opts)
 	strcat(new_opts, *extra_opts);
 
 	snprintf(cbuf, sizeof(cbuf) - 1, "%sclientaddr=%s",
-			*extra_opts ? "," : "", ip_addr);
+			*extra_opts ? "," : "", inet_ntoa(my_addr.sin_addr));
+
 	strcat(new_opts, cbuf);
 
 	*extra_opts = xstrdup(new_opts);
@@ -267,6 +235,60 @@ static int append_clientaddr_opt(const char *spec, char **extra_opts)
 	return 1;
 }
 
+/*
+ * 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
  *
@@ -276,24 +298,33 @@ static int append_clientaddr_opt(const char *spec, char **extra_opts)
  * @extra_opts:	pointer to C string containing fs-specific mount options
  *		(possibly also a return argument)
  * @fake:	flag indicating whether to carry out the whole operation
- * @bg:		one if this is a backgrounded mount attempt
+ * @child:	one if this is a backgrounded mount
  *
  * XXX: need to handle bg, fg, and retry options.
  */
 int nfsmount_s(const char *spec, const char *node, int flags,
-		char **extra_opts, int fake, int bg)
+		char **extra_opts, int fake, int child)
 {
-	int retval = EX_FAIL;
+	struct sockaddr_in saddr;
+	char *hostname;
+	int err;
+
+	if (!parse_devname(spec, &hostname))
+		return EX_FAIL;
+	err = fill_ipv4_sockaddr(hostname, &saddr);
+	free(hostname);
+	if (!err)
+		return EX_FAIL;
 
 	extract_interesting_options(*extra_opts);
 
-	if (!bg && addr_opt) {
+	if (!child && addr_opt) {
 		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		goto fail;
+		return EX_FAIL;
 	}
 
-	if (!append_addr_opt(spec, extra_opts))
-		goto fail;
+	if (!append_addr_opt(&saddr, extra_opts))
+		return EX_FAIL;
 
 	if (verbose)
 		printf(_("%s: text-based options: '%s'\n"),
@@ -303,14 +334,11 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 		if (mount(spec, node, "nfs",
 				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
 			mount_error(spec, node, errno);
-			goto fail;
+			return EX_FAIL;
 		}
 	}
 
-	return 0;
-
-fail:
-	return retval;
+	return EX_SUCCESS;
 }
 
 /*
@@ -330,25 +358,29 @@ fail:
 int nfs4mount_s(const char *spec, const char *node, int flags,
 		char **extra_opts, int fake, int child)
 {
-	int retval = EX_FAIL;
+	struct sockaddr_in saddr;
+	char *hostname;
+	int err;
+
+	if (!parse_devname(spec, &hostname))
+		return EX_FAIL;
+	err = fill_ipv4_sockaddr(hostname, &saddr);
+	free(hostname);
+	if (!err)
+		return EX_FAIL;
 
 	extract_interesting_options(*extra_opts);
 
 	if (addr_opt) {
 		nfs_error(_("%s: Illegal option: 'addr='"), progname);
-		goto fail;
+		return EX_FAIL;
 	}
 
-	if (ca_opt) {
-		nfs_error(_("%s: Illegal option: 'clientaddr='"), progname);
-		goto fail;
-	}
-
-	if (!append_addr_opt(spec, extra_opts))
-		goto fail;
+	if (!append_addr_opt(&saddr, extra_opts))
+		return EX_FAIL;
 
-	if (!append_clientaddr_opt(spec, extra_opts))
-		goto fail;
+	if (!ca_opt && !append_clientaddr_opt(&saddr, extra_opts))
+		return EX_FAIL;
 
 	if (verbose)
 		printf(_("%s: text-based options: '%s'\n"),
@@ -358,12 +390,9 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 		if (mount(spec, node, "nfs4",
 				flags & ~(MS_USER|MS_USERS), *extra_opts)) {
 			mount_error(spec, node, errno);
-			goto fail;
+			return EX_FAIL;
 		}
 	}
 
-	return 0;
-
-fail:
-	return retval;
+	return EX_SUCCESS;
 }