Three more IPv6-related mountd patches
Subsystems (2)
cover Three more IPv6-related mountd patches
Hi Steve-
Here are two clean-up patches, and one patch that modifies the nfs_client struct so it can store both IPv4 and IPv6 addresses concurrently.
---
Chuck Lever (3):
mountd/exportfs: Make m_addrlist field a nfs_sockaddr libexport.a: Clean up client_add() libexport.a: Refactor client_init()
support/export/client.c | 158 ++++++++++++++++++++++++++------------------ support/export/nfsctl.c | 17 ++++- support/include/exportfs.h | 50 +++++++++++++- utils/mountd/auth.c | 2 - utils/mountd/cache.c | 3 + 5 files changed, 158 insertions(+), 72 deletions(-)
Signature · 1 line
Chuck Lever
A message that is not in the archive (sent off-list or not yet received): 20100503192041.29316.35846.stgit-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
PATCH 1/3 libexport.a: Refactor client_init()
Clean up: Move subnet hostname parsing logic out of client_init() to make it simpler to introduce IPv6 support.
Make client_init() a helper, since it's already static.
---
support/export/client.c | 99 +++++++++++++++++++++++++++-------------------- 1 files changed, 56 insertions(+), 43 deletions(-)
support/export/client.c +56 -43
@@ -30,8 +30,6 @@ extern int innetgr(char *netgr, char *host, char *, char *);#endif static char *add_name (char *old,const char *add); -static int client_init (nfs_client *clp,const char *hname, -struct hostent *hp);nfs_client *clientlist[MCL_MAXTYPES ] = {NULL , };
@@ -59,6 +57,62 @@ client_free(nfs_client *clp)free (clp); } +static int +init_netmask (nfs_client *clp,const char *slash) +{ +if (strchr (slash +1 ,'.' ) !=NULL ) + clp->m_addrlist[1 ].s_addr =inet_addr (slash +1 ); +else { +int prefixlen =atoi (slash +1 ); +if (0 < prefixlen && prefixlen <=32 ) + clp->m_addrlist[1 ].s_addr = +htonl ((uint32_t )~0 << (32 - prefixlen)); +else + goto out_badprefix; + } + +return 1 ; + +out_badprefix: +xlog (L_ERROR ,"Invalid prefix `%s' for %s" , slash +1 , clp->m_hostname); +return 0 ; +} + +static int +init_subnetwork (nfs_client *clp) +{ +static char slash32[] ="/32" ; +char *cp; + + cp =strchr (clp->m_hostname,'/' ); +if (cp ==NULL ) + cp = slash32; + + *cp ='\0' ; + clp->m_addrlist[0 ].s_addr =inet_addr (clp->m_hostname); + *cp ='/' ; + +return init_netmask (clp, cp); +} + +static int +client_init (nfs_client *clp,const char *hname,const struct hostent *hp) +{ + clp->m_hostname =strdup (hname); +if (clp->m_hostname ==NULL ) +return 0 ; + + clp->m_exported =0 ; + clp->m_count =0 ; + clp->m_naddr =0 ; + +if (clp->m_type ==MCL_SUBNETWORK ) +return init_subnetwork (clp); + +init_addrlist (clp, hp); +return 1 ; +} +/* 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
@@ -154,47 +208,6 @@ client_dup(nfs_client *clp, struct hostent *hp)return new; } -static int -client_init (nfs_client *clp,const char *hname,struct hostent *hp) -{ - clp->m_hostname =strdup (hname); -if (clp->m_hostname ==NULL ) -return 0 ; - - clp->m_exported =0 ; - clp->m_count =0 ; - clp->m_naddr =0 ; - -if (clp->m_type ==MCL_SUBNETWORK ) { -char *cp =strchr (clp->m_hostname,'/' ); -static char slash32[] ="/32" ; - -if (!cp) cp = slash32; - *cp ='\0' ; - clp->m_addrlist[0 ].s_addr =inet_addr (clp->m_hostname); -if (strchr (cp +1 ,'.' )) { - clp->m_addrlist[1 ].s_addr =inet_addr (cp+1 ); - } -else { -int netmask =atoi (cp +1 ); -if (0 < netmask && netmask <=32 ) { - clp->m_addrlist[1 ].s_addr = -htonl ((uint32_t ) ~0 << (32 - netmask)); - } -else { -xlog (L_ERROR ,"invalid netmask `%s' for %s" , - cp +1 , clp->m_hostname); -return 0 ; - } - } - *cp ='/' ; -return 1 ; - } - -init_addrlist (clp, hp); -return 1 ; -} -void client_add (nfs_client *clp) {
PATCH 2/3 libexport.a: Clean up client_add()
In reply to a message not in the archiveClean up: client_add()'s current callers never set unknown m_type values, so the m_type check is unnecessary.
All of client_add()'s callers are in the same source file where it is defined, so make it a static helper function.
---
support/export/client.c | 26 ++++++++++++-------------- support/include/exportfs.h | 1 - 2 files changed, 12 insertions(+), 15 deletions(-)
support/export/client.c +12 -14
@@ -113,6 +113,18 @@ client_init(nfs_client *clp, const char *hname, const struct hostent *hp)return 1 ; } +static void +client_add (nfs_client *clp) +{ +nfs_client **cpp; + + cpp = &clientlist[clp->m_type]; +while (*cpp !=NULL ) + cpp = &((*cpp)->m_next); + clp->m_next =NULL ; + *cpp = clp; +} +/* 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
@@ -209,20 +221,6 @@ client_dup(nfs_client *clp, struct hostent *hp) }void -client_add (nfs_client *clp) -{ -nfs_client **cpp; - -if (clp->m_type <0 || clp->m_type >=MCL_MAXTYPES ) -xlog (L_FATAL ,"unknown client type in client_add" ); - cpp = clientlist + clp->m_type; -while (*cpp) - cpp = &((*cpp)->m_next); - clp->m_next =NULL ; - *cpp = clp; -} - -void client_release (nfs_client *clp) {if (clp->m_count <=0 )
support/include/exportfs.h +0 -1
@@ -69,7 +69,6 @@ extern exp_hash_table exportlist[MCL_MAXTYPES];extern nfs_client * clientlist[MCL_MAXTYPES ];nfs_client *client_lookup (char *hname,int canonical); -void client_add (nfs_client *);nfs_client *client_dup (nfs_client *,struct hostent *);int client_gettype (char *hname);int client_check (nfs_client *,struct hostent *);
PATCH 3/3 mountd/exportfs: Make m_addrlist field a nfs_sockaddr
In reply to a message not in the archiveTo store non-AF_INET addresses in the nfs_client structure, we need to use more than in_addr for the m_addrlist field. Make m_addrlist larger, then add a few helper functions to handle type casting and array indexing cleanly.
We could treat the nfs_client address list as if all the addresses in the list were the same family. This might work for MCL_SUBNETWORK type nfs_clients. However, during the transition to IPv6, most hosts will have at least one IPv4 and one IPv6 address. For MCL_FQDN, I think we need to have the ability to store addresses from both families in one nfs_client.
Additionally, IPv6 scope IDs are not part of struct sin6_addr. To support link-local IPv6 addresses and the like, a scope ID must be stored.
Thus, each slot in the address list needs to be capable of storing an entire socket address, and not simply the network address part.
---
support/export/client.c | 39 ++++++++++++++++++++++++++--------- support/export/nfsctl.c | 17 ++++++++++++--- support/include/exportfs.h | 49 +++++++++++++++++++++++++++++++++++++++++++- utils/mountd/auth.c | 2 +- utils/mountd/cache.c | 3 ++- 5 files changed, 93 insertions(+), 17 deletions(-)
support/export/client.c +29 -10
@@ -37,6 +37,9 @@ nfs_client *clientlist[MCL_MAXTYPES] = { NULL, };static void init_addrlist (nfs_client *clp,const struct hostent *hp) { +struct sockaddr_in sin = { + .sin_family =AF_INET , + };char **ap;int i;
@@ -44,9 +47,10 @@ init_addrlist(nfs_client *clp, const struct hostent *hp)return ; ap = hp->h_addr_list; -for (i =0 ; *ap !=NULL && i <NFSCLNT_ADDRMAX ; i++, ap++) - clp->m_addrlist[i] = *(struct in_addr *)*ap; - +for (i =0 ; *ap !=NULL && i <NFSCLNT_ADDRMAX ; i++, ap++) { + sin.sin_addr = *(struct in_addr *)*ap; +set_addrlist_in (clp, i, &sin); + } clp->m_naddr = i; }
@@ -60,17 +64,22 @@ client_free(nfs_client *clp)static int init_netmask (nfs_client *clp,const char *slash) { +struct sockaddr_in sin = { + .sin_family =AF_INET , + }; +if (strchr (slash +1 ,'.' ) !=NULL ) - clp->m_addrlist[1 ].s_addr =inet_addr (slash +1 ); + sin.sin_addr.s_addr =inet_addr (slash +1 );else {int prefixlen =atoi (slash +1 );if (0 < prefixlen && prefixlen <=32 ) - clp->m_addrlist[1 ].s_addr = + sin.sin_addr.s_addr =htonl ((uint32_t )~0 << (32 - prefixlen));else goto out_badprefix; } +set_addrlist_in (clp,1 , &sin);return 1 ; out_badprefix:
@@ -81,6 +90,9 @@ out_badprefix:static int init_subnetwork (nfs_client *clp) { +struct sockaddr_in sin = { + .sin_family =AF_INET , + };static char slash32[] ="/32" ;char *cp;
@@ -89,7 +101,8 @@ init_subnetwork(nfs_client *clp) cp = slash32; *cp ='\0' ; - clp->m_addrlist[0 ].s_addr =inet_addr (clp->m_hostname); + sin.sin_addr.s_addr =inet_addr (clp->m_hostname); +set_addrlist_in (clp,0 , &sin); *cp ='/' ;return init_netmask (clp, cp);
@@ -366,6 +379,7 @@ add_name(char *old, const char *add)static int check_fqdn (const nfs_client *clp,const struct hostent *hp) { +const struct sockaddr_in *sin;struct in_addr addr;char **ap;int i;
@@ -373,9 +387,11 @@ check_fqdn(const nfs_client *clp, const struct hostent *hp)for (ap = hp->h_addr_list; *ap; ap++) { addr = *(struct in_addr *)*ap; -for (i =0 ; i < clp->m_naddr; i++) -if (clp->m_addrlist[i].s_addr == addr.s_addr) +for (i =0 ; i < clp->m_naddr; i++) { + sin =get_addrlist_in (clp, i); +if (sin->sin_addr.s_addr == addr.s_addr)return 1 ; + } }return 0 ; }
@@ -388,14 +404,17 @@ check_fqdn(const nfs_client *clp, const struct hostent *hp)static int check_subnetwork (const nfs_client *clp,const struct hostent *hp) { +const struct sockaddr_in *address, *mask;struct in_addr addr;char **ap;for (ap = hp->h_addr_list; *ap; ap++) { + address =get_addrlist_in (clp,0 ); + mask =get_addrlist_in (clp,1 ); addr = *(struct in_addr *)*ap; -if (!((clp->m_addrlist[0 ].s_addr ^ addr.s_addr) & - clp->m_addrlist[1 ].s_addr)) +if (!((address->sin_addr.s_addr ^ addr.s_addr) & + mask->sin_addr.s_addr))return 1 ; }return 0 ;
support/export/nfsctl.c +13 -4
@@ -66,7 +66,7 @@ str_tolower(char *s)static int cltsetup (struct nfsctl_client *cltarg,nfs_client *clp) { -int i; +int i, j;if (clp->m_type !=MCL_FQDN ) {xlog (L_ERROR ,"internal: can't export non-FQDN host" );
@@ -76,10 +76,19 @@ cltsetup(struct nfsctl_client *cltarg, nfs_client *clp)strncpy (cltarg->cl_ident, clp->m_hostname,sizeof (cltarg->cl_ident) -1 );str_tolower (cltarg->cl_ident); - cltarg->cl_naddr = clp->m_naddr; -for (i =0 ; i < cltarg->cl_naddr && i <NFSCLNT_ADDRMAX ; i++) - cltarg->cl_addrlist[i] = clp->m_addrlist[i]; + j =0 ; +for (i =0 ; i < cltarg->cl_naddr && i <NFSCLNT_ADDRMAX ; i++) { +struct sockaddr_in *sin =get_addrlist_in (clp, i); +if (sin->sin_family ==AF_INET ) + cltarg->cl_addrlist[j++] = sin->sin_addr; + } +if (j ==0 ) { +xlog (L_ERROR ,"internal: no supported addresses in nfs_client" ); +return 0 ; + } + + cltarg->cl_naddr = j;return 1 ; }
support/include/exportfs.h +48 -1
65 lines not on this page · raw message
utils/mountd/auth.c +1 -1
@@ -142,7 +142,7 @@ auth_authenticate_newcache(char *what, struct sockaddr_in *caller,return NULL ; my_client.m_naddr =1 ; - my_client.m_addrlist[0 ] = caller->sin_addr; +set_addrlist_in (&my_client,0 , caller); my_exp.m_client = &my_client; exp =NULL ;
utils/mountd/cache.c +2 -1
@@ -863,6 +863,7 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)int cache_export (nfs_export *exp,char *path) { +struct sockaddr_in *sin =get_addrlist_in (exp->m_client,0 );int err;FILE *f;
@@ -871,7 +872,7 @@ int cache_export(nfs_export *exp, char *path)return -1 ;qword_print (f,"nfsd" ); -qword_print (f,inet_ntoa (exp->m_client->m_addrlist[0 ])); +qword_print (f,inet_ntoa (sin->sin_addr));qword_printint (f,time (0 )+30 *60 );qword_print (f, exp->m_client->m_hostname); err =qword_eol (f);
Quoted 14 lines · Chuck Lever
Hi Steve-
Here are two clean-up patches, and one patch that modifies the
nfs_clientstruct so it can store both IPv4 and IPv6 addresses concurrently.---
Chuck Lever (3):
mountd/exportfs: Makem_addrlistfield anfs_sockaddrlibexport.a: Clean upclient_add()libexport.a: Refactorclient_init()
Quoted 7 lines
support/export/client.c | 158 ++++++++++++++++++++++++++------------------ support/export/nfsctl.c | 17 ++++- support/include/exportfs.h | 50 +++++++++++++- utils/mountd/auth.c | 2 - utils/mountd/cache.c | 3 + 5 files changed, 158 insertions(+), 72 deletions(-)
All three committed and pushed...
steved.