Two small mountd IPv6 patches
Subsystems (2)
cover Two small mountd IPv6 patches
Steve-
Two quick clean-ups that prepare for mountd/exportfs IPv6 support.
---
Chuck Lever (2):
libexport.a: Add helper for populating m_addrlist[] libexport.a: Reduce code duplication in client_init()
support/export/client.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-)
Signature · 1 line
Chuck Lever
A message that is not in the archive (sent off-list or not yet received): 20100412195538.9839.76495.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
PATCH 1/2 libexport.a: Reduce code duplication in client_init()
Clean up: Most cases in client_init() set clp->m_naddr to zero. Move it to the common part of the function, and simplify the logic. This will make adding IPv6 support here more straightforward.
---
support/export/client.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
support/export/client.c +5 -4
@@ -137,6 +137,7 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp) clp->m_exported =0 ; clp->m_count =0 ; + clp->m_naddr =0 ;if (clp->m_type ==MCL_SUBNETWORK ) {char *cp =strchr (clp->m_hostname,'/' );
@@ -160,10 +161,10 @@ client_init(nfs_client *clp, const char *hname, struct hostent *hp) } } *cp ='/' ; - clp->m_naddr =0 ; - }else if (!hp) { - clp->m_naddr =0 ; - }else { +return ; + } + +if (hp) {char **ap = hp->h_addr_list;int i;
PATCH 2/2 libexport.a: Add helper for populating m_addrlist[]
In reply to a message not in the archiveClean 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.
---
support/export/client.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-)
support/export/client.c +20 -18
@@ -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
Quoted 6 lines · Chuck Lever
Steve-
Two quick clean-ups that prepare for mountd/exportfs IPv6 support.
---
Quoted 8 lines
Chuck Lever (2):
libexport.a: Add helper for populating m_addrlist[] libexport.a: Reduce code duplication inclient_init()support/export/client.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-)
Committed...
steved.