libexport.a: Use host helper to parse address in client_init()
authorChuck Lever <chuck.lever@oracle.com>
Tue, 31 Aug 2010 19:27:19 +0000 (15:27 -0400)
committerSteve Dickson <steved@redhat.com>
Tue, 31 Aug 2010 19:34:23 +0000 (15:34 -0400)
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>
Signed-off-by: Steve Dickson <steved@redhat.com>
support/export/client.c

index 3e797c9..a89142d 100644 (file)
@@ -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);
 }