X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=e2e72a7c552cdce84eb6d68e99b617fb1df6bac2;hp=34b4134076cf1faa8aa7bd54e6665549338a4ca7;hb=586a66451679e25c47cb8cd65a0c6a0c44148920;hpb=8bca04ebcc345784bf2ef29f0781e66157d76558 diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 34b4134..e2e72a7 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -33,8 +33,11 @@ #include #include #include + #include #include +#include +#include #include "xcommon.h" #include "mount.h" @@ -91,6 +94,8 @@ struct nfsmount_info { int flags, /* MS_ flags */ fake, /* actually do the mount? */ child; /* forked bg child? */ + + sa_family_t family; /* supported address family */ }; static int nfs_parse_devname(struct nfsmount_info *mi) @@ -191,6 +196,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 +239,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,48 +254,47 @@ 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; - - snprintf(new_option, sizeof(new_option) - 1, - "clientaddr=%s", inet_ntoa(my_addr.sin_addr)); + nfs_callback_address(sap, salen, my_addr, &my_len); - if (po_append(options, new_option) == PO_SUCCEEDED) - return 1; - return 0; + return nfs_append_generic_address_option(my_addr, my_len, + "clientaddr", options); } /* * Resolve the 'mounthost=' hostname and append a new option using - * the resulting IPv4 address. + * the resulting address. */ -static int fix_mounthost_option(struct mount_options *options) +static int nfs_fix_mounthost_option(const sa_family_t family, + struct mount_options *options) { - struct sockaddr_in maddr; - char *mounthost, new_option[32]; + struct sockaddr_storage dummy; + struct sockaddr *sap = (struct sockaddr *)&dummy; + socklen_t salen = sizeof(dummy); + char *mounthost; mounthost = po_get(options, "mounthost"); if (!mounthost) return 1; - if (!fill_ipv4_sockaddr(mounthost, &maddr)) + if (!nfs_name_to_address(mounthost, family, sap, &salen)) { + nfs_error(_("%s: unable to determine mount server's address"), + progname); return 0; + } - snprintf(new_option, sizeof(new_option) - 1, - "mountaddr=%s", inet_ntoa(maddr.sin_addr)); - - if (po_append(options, new_option) == PO_SUCCEEDED) - return 1; - return 0; + return nfs_append_generic_address_option(sap, salen, + "mountaddr", options); } /* @@ -312,10 +340,11 @@ 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)) + if (!nfs_fix_mounthost_option(mi->family, mi->options)) return 0; if (!mi->fake && !verify_lock_option(mi->options)) return 0; @@ -324,10 +353,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); } /* @@ -777,6 +804,11 @@ int nfsmount_string(const char *spec, const char *node, const char *type, .flags = flags, .fake = fake, .child = child, +#ifdef IPV6_SUPPORTED + .family = AF_UNSPEC, /* either IPv4 or v6 */ +#else + .family = AF_INET, /* only IPv4 */ +#endif }; int retval = EX_FAIL;