public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: steved@redhat.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 2/5] libexport.a: Use host helper to parse address in client_init()
Date: Tue, 24 Aug 2010 12:35:32 -0400	[thread overview]
Message-ID: <20100824163532.2433.10443.stgit@matisse.1015granger.net> (raw)
In-Reply-To: <20100824162926.2433.7535.stgit@matisse.1015granger.net>

Take the first step towards making it possible to parse either IPv4 or
IPv6 addresses in client_init().  It won't handle IPv6 until
host_pton() has IPv6 support enabled, and it still doesn't deal with
IPv6 netmasks yet.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 support/export/client.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/support/export/client.c b/support/export/client.c
index 3e797c9..a89142d 100644
--- a/support/export/client.c
+++ b/support/export/client.c
@@ -86,10 +86,8 @@ out_badprefix:
 static int
 init_subnetwork(nfs_client *clp)
 {
-	struct sockaddr_in sin = {
-		.sin_family		= AF_INET,
-	};
 	static char slash32[] = "/32";
+	struct addrinfo *ai;
 	char *cp;
 
 	cp = strchr(clp->m_hostname, '/');
@@ -97,9 +95,14 @@ init_subnetwork(nfs_client *clp)
 		cp = slash32;
 
 	*cp = '\0';
-	sin.sin_addr.s_addr = inet_addr(clp->m_hostname);
-	set_addrlist_in(clp, 0, &sin);
+	ai = host_pton(clp->m_hostname);
 	*cp = '/';
+	if (ai == NULL) {
+		xlog(L_ERROR, "Invalid IP address %s", clp->m_hostname);
+		return false;
+	}
+	set_addrlist(clp, 0, ai->ai_addr);
+	freeaddrinfo(ai);
 
 	return init_netmask(clp, cp);
 }


  parent reply	other threads:[~2010-08-24 16:35 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-24 16:35 [PATCH 0/5] Support IPv6 in libexport.a Chuck Lever
2010-08-24 16:35 ` [PATCH 1/5] libexport.a: Prepare to recognize IPv6 addresses in client_gettype() Chuck Lever
2010-08-24 16:35 ` Chuck Lever [this message]
2010-08-24 16:35 ` [PATCH 3/5] libexport.a: Prepare init_subnetwork() for IPv6 support Chuck Lever
2010-08-24 16:35 ` [PATCH 4/5] libexport.a: IPv6 support for client_init_subnet() Chuck Lever
2010-08-24 16:36 ` [PATCH 5/5] libexport.a: IPv6 support in client_check() Chuck Lever
2010-08-31 19:43 ` [PATCH 0/5] Support IPv6 in libexport.a Steve Dickson
     [not found]   ` <4C7D5B63.9060907-AfCzQyP5zfLQT0dZR+AlfA@public.gmane.org>
2010-08-31 20:36     ` Chuck Lever
2010-08-31 23:41       ` Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100824163532.2433.10443.stgit@matisse.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=steved@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox