From d91c8c50d22f086a48c1cb4c275b0669278ef714 Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 5 Dec 2001 13:25:29 +0000 Subject: [PATCH] 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. --- socket.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/socket.c b/socket.c index 2c2191e1..94c28a6f 100644 --- a/socket.c +++ b/socket.c @@ -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; -- 2.34.1