#include "nls.h"
#include "nfs_mount.h"
#include "mount_constants.h"
+#include "stropts.h"
#include "error.h"
#include "network.h"
+#include "parse_opt.h"
#ifdef HAVE_RPCSVC_NFS_PROT_H
#include <rpcsvc/nfs_prot.h>
#define NFS_PORT 2049
#endif
+#ifndef NFS_MAXHOSTNAME
+#define NFS_MAXHOSTNAME (255)
+#endif
+
+#ifndef NFS_MAXPATHNAME
+#define NFS_MAXPATHNAME (1024)
+#endif
+
extern int nfs_mount_data_version;
extern char *progname;
extern int verbose;
-static int retry_opt = 10000; /* 10,000 minutes ~= 1 week */
-static int bg_opt = 0;
-static int addr_opt = 0;
-static int ca_opt = 0;
-
-static int parse_devname(char *hostdir, char **hostname, char **dirname)
+static int parse_devname(const char *spec, char **hostname)
{
- char *s;
+ int ret = 0;
+ char *dev, *pathname, *s;
+
+ dev = xstrdup(spec);
- if (!(s = strchr(hostdir, ':'))) {
- nfs_error(_("%s: directory to mount not in host:dir format"),
+ if (!(pathname = strchr(dev, ':'))) {
+ nfs_error(_("%s: remote share not in 'host:dir' format"),
+ progname);
+ goto out;
+ }
+ *pathname = '\0';
+ pathname++;
+
+ /*
+ * We don't need a copy of the pathname, but let's
+ * sanity check it anyway.
+ */
+ if (strlen(pathname) > NFS_MAXPATHNAME) {
+ nfs_error(_("%s: export pathname is too long"),
progname);
- return -1;
+ goto out;
}
- *hostname = hostdir;
- *dirname = s + 1;
- *s = '\0';
- /* Ignore all but first hostname in replicated mounts
- until they can be fully supported. (mack@sgi.com) */
- if ((s = strchr(hostdir, ','))) {
+
+ /*
+ * Ignore all but first hostname in replicated mounts
+ * until they can be fully supported. (mack@sgi.com)
+ */
+ if ((s = strchr(dev, ','))) {
*s = '\0';
nfs_error(_("%s: warning: multiple hostnames not supported"),
progname);
+ nfs_error(_("%s: ignoring hostnames that follow the first one"),
+ progname);
}
- return 0;
+ *hostname = xstrdup(dev);
+ if (strlen(*hostname) > NFS_MAXHOSTNAME) {
+ nfs_error(_("%s: server hostname is too long"),
+ progname);
+ free(*hostname);
+ goto out;
+ }
+
+ ret = 1;
+
+out:
+ free(dev);
+ return ret;
}
static int fill_ipv4_sockaddr(const char *hostname, struct sockaddr_in *addr)
}
/*
- * 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
+ * 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 get_my_ipv4addr(char *ip_addr, int len)
+static int append_addr_option(struct sockaddr_in *saddr,
+ struct mount_options *options)
{
- char myname[1024];
- struct sockaddr_in myaddr;
+ char new_option[24];
- 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;
+ po_remove_all(options, "addr");
- snprintf(ip_addr, len, "%s", inet_ntoa(myaddr.sin_addr));
- ip_addr[len - 1] = '\0';
+ snprintf(new_option, sizeof(new_option) - 1,
+ "addr=%s", inet_ntoa(saddr->sin_addr));
- return 1;
+ if (po_append(options, new_option) == PO_SUCCEEDED)
+ return 1;
+ return 0;
}
/*
- * Walk through our mount options string, and indicate the presence
- * of 'bg', 'retry=', and 'clientaddr='.
+ * 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 void extract_interesting_options(char *opts)
+static int append_clientaddr_option(struct sockaddr_in *saddr,
+ struct mount_options *options)
{
- char *opt, *opteq;
- int val;
-
- opts = xstrdup(opts);
-
- for (opt = strtok(opts, ","); opt; opt = strtok(NULL, ",")) {
- if ((opteq = strchr(opt, '='))) {
- val = atoi(opteq + 1);
- *opteq = '\0';
- if (strcmp(opt, "bg") == 0)
- bg_opt++;
- else if (strcmp(opt, "retry") == 0)
- retry_opt = val;
- else if (strcmp(opt, "addr") == 0)
- addr_opt++;
- else if (strcmp(opt, "clientaddr") == 0)
- ca_opt++;
- } else {
- if (strcmp(opt, "bg") == 0)
- bg_opt++;
- }
- }
+ 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;
- free(opts);
+ 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;
}
/*
- * Append the "addr=" option to the options string.
- *
- * We always add our own addr= to the end of the options string.
+ * Resolve the 'mounthost=' hostname and append a new option using
+ * the resulting IPv4 address.
*/
-static int append_addr_opt(const char *spec, char **extra_opts)
+static int fix_mounthost_option(struct mount_options *options)
{
- static char hostdir[1024], new_opts[1024], ip_addr[255];
- char *hostname, *dirname, *s, *old_opts;
- struct sockaddr_in addr;
+ struct sockaddr_in maddr;
+ char *mounthost, new_option[32];
- if (strlen(spec) >= sizeof(hostdir)) {
- nfs_error(_("%s: excessively long host:dir argument\n"),
- progname);
- return 0;
- }
- strcpy(hostdir, spec);
- if (parse_devname(hostdir, &hostname, &dirname)) {
- nfs_error(_("%s: parsing host:dir argument failed\n"),
- progname);
- return 0;
- }
+ mounthost = po_get(options, "mounthost");
+ if (!mounthost)
+ return 1;
- if (!fill_ipv4_sockaddr(hostname, &addr))
- return 0;
- if (!get_my_ipv4addr(ip_addr, sizeof(ip_addr)))
+ if (!fill_ipv4_sockaddr(mounthost, &maddr))
return 0;
- /* add IP address to mtab options for use when unmounting */
- s = inet_ntoa(addr.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"),
- progname);
- return 0;
- }
- snprintf(new_opts, sizeof(new_opts), "%s%saddr=%s",
- old_opts, *old_opts ? "," : "", s);
- *extra_opts = xstrdup(new_opts);
+ snprintf(new_option, sizeof(new_option) - 1,
+ "mountaddr=%s", inet_ntoa(maddr.sin_addr));
- return 1;
+ if (po_append(options, new_option) == PO_SUCCEEDED)
+ return 1;
+ return 0;
}
/*
- * Append the "clientaddr=" option to the options string.
+ * Set up mandatory mount options.
*
- * Returns 1 if clientaddr option created successfully;
- * otherwise zero.
+ * Returns 1 if successful; otherwise zero.
*/
-static int append_clientaddr_opt(const char *spec, char **extra_opts)
+static int set_mandatory_options(const char *type,
+ struct sockaddr_in *saddr,
+ struct mount_options *options)
{
- static char new_opts[1024], cbuf[1024];
- static char ip_addr[16] = "127.0.0.1";
-
- if (!get_my_ipv4addr(ip_addr, sizeof(ip_addr)))
+ if (!append_addr_option(saddr, options))
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"),
- progname);
- return 0;
+ if (strncmp(type, "nfs4", 4) == 0) {
+ if (!append_clientaddr_option(saddr, options))
+ return 0;
+ } else {
+ if (!fix_mounthost_option(options))
+ return 0;
}
- strcat(new_opts, *extra_opts);
-
- snprintf(cbuf, sizeof(cbuf) - 1, "%sclientaddr=%s",
- *extra_opts ? "," : "", ip_addr);
- strcat(new_opts, cbuf);
-
- *extra_opts = xstrdup(new_opts);
-
return 1;
}
* @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 mount_options *options = NULL;
+ struct sockaddr_in saddr;
+ char *hostname;
+ int err, retval = EX_FAIL;
+
+ if (!parse_devname(spec, &hostname))
+ goto out;
+ err = fill_ipv4_sockaddr(hostname, &saddr);
+ free(hostname);
+ if (!err)
+ goto out;
+
+ options = po_split(*extra_opts);
+ if (!options) {
+ nfs_error(_("%s: internal option parsing error"), progname);
+ goto out;
+ }
- extract_interesting_options(*extra_opts);
+ if (!append_addr_option(&saddr, options))
+ goto out;
- if (!addr_opt && !append_addr_opt(spec, extra_opts))
- goto fail;
+ if (!fix_mounthost_option(options))
+ goto out;
+
+ if (po_join(options, extra_opts) == PO_FAILED) {
+ nfs_error(_("%s: internal option parsing error"), progname);
+ goto out;
+ }
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (mount(spec, node, "nfs",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
- goto fail;
+ goto out;
}
}
- return 0;
+ retval = EX_SUCCESS;
-fail:
+out:
+ po_destroy(options);
return retval;
}
* @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 nfs4mount_s(const char *spec, const char *node, int flags,
- char **extra_opts, int fake)
+ char **extra_opts, int fake, int child)
{
- int retval = EX_FAIL;
+ struct mount_options *options = NULL;
+ struct sockaddr_in saddr;
+ char *hostname;
+ int err, retval = EX_FAIL;
+
+ if (!parse_devname(spec, &hostname))
+ goto out;
+ err = fill_ipv4_sockaddr(hostname, &saddr);
+ free(hostname);
+ if (!err)
+ goto out;
+
+ options = po_split(*extra_opts);
+ if (!options) {
+ nfs_error(_("%s: internal option parsing error"), progname);
+ goto out;
+ }
- extract_interesting_options(*extra_opts);
+ if (!append_addr_option(&saddr, options))
+ goto out;
- if (!addr_opt && !append_addr_opt(spec, extra_opts))
- goto fail;
+ if (!append_clientaddr_option(&saddr, options))
+ goto out;
- if (!ca_opt && !append_clientaddr_opt(spec, extra_opts))
- goto fail;
+ if (po_join(options, extra_opts) == PO_FAILED) {
+ nfs_error(_("%s: internal option parsing error"), progname);
+ goto out;
+ }
if (verbose)
printf(_("%s: text-based options: '%s'\n"),
if (mount(spec, node, "nfs4",
flags & ~(MS_USER|MS_USERS), *extra_opts)) {
mount_error(spec, node, errno);
- goto fail;
+ goto out;
}
}
- return 0;
+ retval = EX_SUCCESS;
-fail:
+out:
+ po_destroy(options);
return retval;
}
projects / nfs-utils.git / blobdiff