Some IPv6 enhancements for nfs-utils

Each of these buffers is use to hold the presentation format for an address which could be either IPv4 or IPv6, so make the buffers large enough for either.

Signed-off-by NeilBrown <[email protected]>

---
 support/export/hostname.c |    2 +-
 utils/mountd/cache.c      |    6 +++---
 utils/mountd/rmtab.c      |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

support/export/hostname.c +1 -1

index 232e040..f6a59f1 100644
@@ -299,7 +299,7 @@ struct addrinfo *
 host_numeric_addrinfo(const struct sockaddr *sap)
 {
 	socklen_t salen = sockaddr_size(sap);
-	char buf[INET_ADDRSTRLEN];
+	char buf[INET6_ADDRSTRLEN];
 	struct addrinfo *ai;
 	int error;
 

utils/mountd/cache.c +3 -3

index bf18a9a..736668e 100644
@@ -75,7 +75,7 @@ void auth_unix_ip(FILE *f)
 	 */
 	char *cp;
 	char class[20];
-	char ipaddr[20];
+	char ipaddr[INET6_ADDRSTRLEN];
 	char *client = NULL;
 	struct addrinfo *tmp = NULL;
 	struct addrinfo *ai = NULL;

@@ -90,7 +90,7 @@ void auth_unix_ip(FILE *f)
 	    strcmp(class, "nfsd") != 0)
 		return;
 
-	if (qword_get(&cp, ipaddr, 20) <= 0)
+	if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0)
 		return;
 
 	tmp = host_pton(ipaddr);

@@ -920,7 +920,7 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
 
 int cache_export(nfs_export *exp, char *path)
 {
-	char buf[INET_ADDRSTRLEN];
+	char buf[INET6_ADDRSTRLEN];
 	int err;
 	FILE *f;
 

utils/mountd/rmtab.c +0 -0

index ba0fcf6..d86b0db 100644

Allow host_pton, host_addrinfo, and all functions that use sockaddr_size to work correctly with IPv6 addresses.

This means host_addrinfo can now return IPv6 addresses, but I think all code is ready for that.

Signed-off-by NeilBrown <[email protected]>

---
 support/export/hostname.c |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

support/export/hostname.c +0 -0

index f6a59f1..46ddfe2 100644
@@ -38,9 +38,11 @@
 static socklen_t
 sockaddr_size(const struct sockaddr *sap)
 {

support/export/hostname.c +0 -0

@@ -126,10 +128,12 @@ host_pton(const char *paddr)
 	 * addresses that end with a blank.
 	 *
 	 * inet_pton(3) is much stricter.  Use it to be certain we

support/export/hostname.c +1 -1

 	error = getaddrinfo(paddr, NULL, &hint, &ai);

@@ -168,7 +172,7 @@ host_addrinfo(const char *hostname)
 {
 	struct addrinfo *ai = NULL;
 	struct addrinfo hint = {
-		.ai_family	= AF_INET,
+		.ai_family	= AF_UNSPEC,
 		/* don't return duplicates */
 		.ai_protocol	= (int)IPPROTO_UDP,
 		.ai_flags	= AI_ADDRCONFIG | AI_CANONNAME,

@@ -178,7 +182,13 @@ host_addrinfo(const char *hostname)
 	error = getaddrinfo(hostname, NULL, &hint, &ai);

support/export/hostname.c +0 -0

 	case EAI_SYSTEM:
 		xlog(D_GENERAL, "%s: failed to resolve %s: (%d) %m",
 				__func__, hostname, errno);

Simply use nfs_compare_sockaddr in place of addrs_match

Signed-off-by NeilBrown <[email protected]>

---
 support/export/client.c |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

support/export/client.c +0 -21

index dc01067..286dcd6 100644
@@ -372,27 +372,6 @@ add_name(char *old, const char *add)
 	return new;
 }
 
-static _Bool
-addrs_match4(const struct sockaddr *sa1, const struct sockaddr *sa2)
-{
-	const struct sockaddr_in *si1 = (const struct sockaddr_in *)sa1;
-	const struct sockaddr_in *si2 = (const struct sockaddr_in *)sa2;
-
-	return si1->sin_addr.s_addr == si2->sin_addr.s_addr;
-}
-
-static _Bool
-addrs_match(const struct sockaddr *sa1, const struct sockaddr *sa2)
-{
-	if (sa1->sa_family == sa2->sa_family)
-		switch (sa1->sa_family) {
-		case AF_INET:
-			return addrs_match4(sa1, sa2);
-		}
-
-	return false;
-}
-
 /*
  * Check each address listed in @ai against each address
  * stored in @clp.  Return 1 if a match is found, otherwise

Hi Chuck et al,
I've been playing with IPv6 server support and offer these patches which get us a little bit closer.
I realise that you may already have similar patches queued in which case feel free to ignore these.

With these plus a couple of #defines of IPV6_SUPPORTED I can export with NFSv4 over IPv6 quite successfully.

NeilBrown

---

Neil Brown (3):
Make buffers large enough for IPv6 addresses
Give hostname.c more support for IPv6
Allow check_fqdn to compare IPv6 addresses

support/export/client.c   |   23 +----------------------
support/export/hostname.c |   28 +++++++++++++++++++---------
utils/mountd/cache.c      |    6 +++---
utils/mountd/rmtab.c      |    2 +-
4 files changed, 24 insertions(+), 35 deletions(-)

Signature · 1 line

Signature