diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2010-04-15 08:59:18 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-04-15 08:59:18 -0400 |
| commit | 30eff9c26141746fb26efb1af60d5cbe7a16ebae (patch) | |
| tree | e2e7933ed4b5573cc19b32f2dbd627bfe65e6d35 /support/export | |
| parent | e1c93f691348392ee36b763bf57946540891ff16 (diff) | |
| download | nfs-utils-30eff9c26141746fb26efb1af60d5cbe7a16ebae.tar.gz nfs-utils-30eff9c26141746fb26efb1af60d5cbe7a16ebae.tar.xz nfs-utils-30eff9c26141746fb26efb1af60d5cbe7a16ebae.zip | |
libexport.a: Add helper for populating m_addrlist[]
Clean up: Move common code that populates an nfs_client record's
m_addrlist to a helper function. This eliminates a little code
duplication, and makes it simpler to add IPv6 support later.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'support/export')
| -rw-r--r-- | support/export/client.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/support/export/client.c b/support/export/client.c index e06c874..6a25928 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -36,6 +36,22 @@ static void client_init(nfs_client *clp, const char *hname, nfs_client *clientlist[MCL_MAXTYPES] = { NULL, }; +static void +init_addrlist(nfs_client *clp, const struct hostent *hp) +{ + char **ap; + int i; + + if (hp == NULL) + return; + + ap = hp->h_addr_list; + for (i = 0; *ap != NULL && i < NFSCLNT_ADDRMAX; i++, ap++) + clp->m_addrlist[i] = *(struct in_addr *)*ap; + + clp->m_naddr = i; +} + /* if canonical is set, then we *know* this is already a canonical name * so hostname lookup is avoided. * This is used when reading /proc/fs/nfs/exports @@ -96,14 +112,8 @@ client_lookup(char *hname, int canonical) client_add(clp); } - if (htype == MCL_FQDN && clp->m_naddr == 0 && hp != NULL) { - char **ap = hp->h_addr_list; - int i; - - for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) - clp->m_addrlist[i] = *(struct in_addr *)*ap; - clp->m_naddr = i; - } + if (htype == MCL_FQDN && clp->m_naddr == 0) + init_addrlist(clp, hp); if (hp) free (hp); @@ -163,16 +173,8 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp) *cp = '/'; return; } - - if (hp) { - char **ap = hp->h_addr_list; - int i; - - for (i = 0; *ap && i < NFSCLNT_ADDRMAX; i++, ap++) { - clp->m_addrlist[i] = *(struct in_addr *)*ap; - } - clp->m_naddr = i; - } + + init_addrlist(clp, hp); } void |