RFC2553 just says that sockaddr_storage has to have initial fields

isomorphic to sa_family etc from a struct sockaddr, not what they're
called.  On some platforms they seem not to be called ss_family.
Rather than guess, we will try casting to a sockaddr and looking
through that -- I think this is what the RFC intends.
This commit is contained in:
Martin Pool committed 2001-12-05 13:25:29 +00:00
1 parent e20a4f84d6
commit d91c8c50d2
1 file changed
+8 -2
+8 -2
View File
@@ -578,6 +578,12 @@ char *client_addr(int fd)
}
static sa_family_t get_sockaddr_family(const struct sockaddr_storage *ss)
{
return ((struct sockaddr *) ss)->sa_family;
}
/**
* Return the DNS name of the client
**/
@@ -606,7 +612,7 @@ char *client_name(int fd)
}
#ifdef INET6
if (ss.ss_family == AF_INET6 &&
if (get_sockaddr_family(&ss) == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
struct sockaddr_in6 sin6;
struct sockaddr_in *sin;
@@ -650,7 +656,7 @@ char *client_name(int fd)
/* XXX sin6_flowinfo and other fields */
for (res = res0; res; res = res->ai_next) {
if (res->ai_family != ss.ss_family)
if (res->ai_family != get_sockaddr_family(&ss))
continue;
if (res->ai_addrlen != length)
continue;