From: Jeff Layton Subject: Re: [PATCH] mount.cifs: Add support for parsing IPv6 addresses enclosed in brackets. Date: Mon, 15 Apr 2013 10:34:04 -0700 Message-ID: <20130415103404.1045cd3c@corrin.poochiereds.net> References: <1365963558-20082-1-git-send-email-scott.lovenberg@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: smfrench-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: scott.lovenberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org Return-path: In-Reply-To: <1365963558-20082-1-git-send-email-scott.lovenberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-cifs-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: On Sun, 14 Apr 2013 14:19:18 -0400 scott.lovenberg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org wrote: > From: Scott Lovenberg > > The standard for formatting IPv6 addresses is to enclose them in brackets. > This patch allows the mount helper to parse IPv6 addresses that are enclosed in brackets. > There is a slight change of behavior in this patch; specifying the --ip option without > supplying an address now exits the mount helper rather than just ignoring and continuing. > > Signed-off-by: Scott Lovenberg > --- > AUTHORS | 1 + > mount.cifs.c | 63 ++++++++++++++++++++++++++++++++++++++++++---------------- > 2 files changed, 47 insertions(+), 17 deletions(-) > > diff --git a/AUTHORS b/AUTHORS > index 2807079..081c2fe 100644 > --- a/AUTHORS > +++ b/AUTHORS > @@ -5,5 +5,6 @@ Shirish Pargaonkar > Suresh Jayaraman > Pavel Shilovsky > Igor Druzhinin > +Scott Lovenberg > > ...and others. > diff --git a/mount.cifs.c b/mount.cifs.c > index 3b2b89e..276f50d 100644 > --- a/mount.cifs.c > +++ b/mount.cifs.c > @@ -751,6 +751,48 @@ static int parse_opt_token(const char *token) > return OPT_ERROR; > } > > +/* > + Extract an ipv4 or ipv6 address and put it into parsed_info. > + Returns 0 on success. > +*/ > +static int parse_ip(char *value, struct parsed_mount_info *parsed_info) > +{ > + char *closingBracket = NULL; > + > + if (!value || !*value) { > + fprintf(stderr, "target ip address argument missing\n"); > + return OPT_ERROR; I think you want something like EX_USAGE here. > + } > + > + /* check for ipv6 in brackets */ > + if (value[0] == '[') { > + value++; > + /* temporarily null the closing bracket */ > + closingBracket = strchr(value, ']'); > + if (closingBracket) > + *closingBracket = '\0'; > + } > + > + /* check length of address*/ > + if (strnlen(value, MAX_ADDRESS_LEN + 1) > MAX_ADDRESS_LEN) { > + fprintf(stderr, "ip address too long\n"); > + if (closingBracket) > + *closingBracket = ']'; > + return EX_USAGE; > + } > + > + /* all test pass, copy it */ > + strcpy(parsed_info->addrlist, value); > + if (parsed_info->verboseflag) > + fprintf(stderr, "ip address %s override specified\n", value); > + > + /* put back closing bracket */ > + if (closingBracket) > + *closingBracket = ']'; > + > + return 0; > +} > + > static int > parse_options(const char *data, struct parsed_mount_info *parsed_info) > { > @@ -861,23 +903,10 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) > break; > > case OPT_IP: > - if (!value || !*value) { > - fprintf(stderr, > - "target ip address argument missing\n"); > - } else if (strnlen(value, MAX_ADDRESS_LEN) <= > - MAX_ADDRESS_LEN) { > - strcpy(parsed_info->addrlist, value); > - if (parsed_info->verboseflag) > - fprintf(stderr, > - "ip address %s override specified\n", > - value); > - goto nocopy; > - } else { > - fprintf(stderr, "ip address too long\n"); > - return EX_USAGE; > - > - } > - break; > + rc = parse_ip(value, parsed_info); > + if (rc) > + return rc; > + goto nocopy; > > /* unc || target || path */ > case OPT_UNC: -- Jeff Layton