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='.
* 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;
-
- err = fill_ipv4_sockaddr(hostname, &addr);
- free(hostname);
- if (!err)
- return 0;
+ char *s, *old_opts;
- 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;
}
}
/*
- * 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;
}
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);
* @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"),
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;
}
/*
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;
- }
-
- if (ca_opt) {
- nfs_error(_("%s: Illegal option: 'clientaddr='"), 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 (!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"),
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;
}
projects / nfs-utils.git / blobdiff