text-based mount.nfs: Use new parser to handle 'addr=' and 'clientaddr='
Subsystems (2)
PATCH 2/7 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 <[email protected]>
---
utils/mount/stropts.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-)
utils/mount/stropts.c +55 -0
@@ -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
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs