If --enable-ipv6 is specified when building nfs-utils, libexport's
host_foo() helpers can now return both IPv4 and IPv6 addresses.
This means IPv6 presentation addresses and IPv6 DNS resolution
results are handled properly in the mountd cache and /etc/exports,
but does not yet enable IPv6 mountd listeners.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
#define AI_ADDRCONFIG 0
#endif
#define AI_ADDRCONFIG 0
#endif
-#ifdef HAVE_GETNAMEINFO
-static socklen_t
-sockaddr_size(const struct sockaddr *sap)
-{
- if (sap->sa_family != AF_INET)
- return 0;
- return (socklen_t)sizeof(struct sockaddr_in);
-}
-#endif /* HAVE_GETNAMEINFO */
-
/**
* host_ntop - generate presentation address given a sockaddr
* @sap: pointer to socket address
/**
* host_ntop - generate presentation address given a sockaddr
* @sap: pointer to socket address
char *
host_ntop(const struct sockaddr *sap, char *buf, const size_t buflen)
{
char *
host_ntop(const struct sockaddr *sap, char *buf, const size_t buflen)
{
- socklen_t salen = sockaddr_size(sap);
+ socklen_t salen = nfs_sockaddr_length(sap);
int error;
memset(buf, 0, buflen);
int error;
memset(buf, 0, buflen);
.ai_family = AF_UNSPEC,
};
struct sockaddr_in sin;
.ai_family = AF_UNSPEC,
};
struct sockaddr_in sin;
/*
* Although getaddrinfo(3) is easier to use and supports
/*
* Although getaddrinfo(3) is easier to use and supports
* have a real AF_INET presentation address, before invoking
* getaddrinfo(3) to generate the full addrinfo list.
*/
* have a real AF_INET presentation address, before invoking
* getaddrinfo(3) to generate the full addrinfo list.
*/
if (inet_pton(AF_INET, paddr, &sin.sin_addr) == 0)
if (inet_pton(AF_INET, paddr, &sin.sin_addr) == 0)
error = getaddrinfo(paddr, NULL, &hint, &ai);
switch (error) {
case 0:
error = getaddrinfo(paddr, NULL, &hint, &ai);
switch (error) {
case 0:
+ if (!inet4 && ai->ai_addr->sa_family == AF_INET) {
+ freeaddrinfo(ai);
+ break;
+ }
return ai;
case EAI_NONAME:
if (paddr == NULL)
return ai;
case EAI_NONAME:
if (paddr == NULL)
{
struct addrinfo *ai = NULL;
struct addrinfo hint = {
{
struct addrinfo *ai = NULL;
struct addrinfo hint = {
+#ifdef IPV6_SUPPORTED
+ .ai_family = AF_UNSPEC,
+#else
/* don't return duplicates */
.ai_protocol = (int)IPPROTO_UDP,
.ai_flags = AI_ADDRCONFIG | AI_CANONNAME,
/* don't return duplicates */
.ai_protocol = (int)IPPROTO_UDP,
.ai_flags = AI_ADDRCONFIG | AI_CANONNAME,
char *
host_canonname(const struct sockaddr *sap)
{
char *
host_canonname(const struct sockaddr *sap)
{
- socklen_t salen = sockaddr_size(sap);
+ socklen_t salen = nfs_sockaddr_length(sap);
char buf[NI_MAXHOST];
int error;
char buf[NI_MAXHOST];
int error;
struct addrinfo *
host_numeric_addrinfo(const struct sockaddr *sap)
{
struct addrinfo *
host_numeric_addrinfo(const struct sockaddr *sap)
{
- socklen_t salen = sockaddr_size(sap);
- char buf[INET_ADDRSTRLEN];
+ socklen_t salen = nfs_sockaddr_length(sap);
+ char buf[INET6_ADDRSTRLEN];
struct addrinfo *ai;
int error;
struct addrinfo *ai;
int error;