From 61bf4c53aa1522c4f0e8d1f912b6ab19154ed538 Mon Sep 17 00:00:00 2001 From: Nolan Prescott Date: Fri, 18 Dec 2020 21:30:42 -0500 Subject: [PATCH] Fix IP address logging Cast generic sockaddr to the appropriate sockaddr_ AF and switch inet_ntop argument accordingly. Intended to fix issue reported on ~sircmpwn/gmni-discuss: "Logged IPv4 addresses are wrong" --- src/log.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/log.c b/src/log.c index c1aa13b..4d125b3 100644 --- a/src/log.c +++ b/src/log.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include "log.h" @@ -17,11 +18,26 @@ static void client_logf(FILE *f, struct sockaddr *addr, const char *fmt, va_list ap) { char abuf[INET6_ADDRSTRLEN + 1]; - const char *addrs = inet_ntop(addr->sa_family, - addr->sa_data, abuf, sizeof(abuf)); - assert(addrs); - fprintf(f, "%s ", addrs); + switch(addr->sa_family) { + case AF_INET: { + struct sockaddr_in *addr_in = (struct sockaddr_in *)addr; + const char* result = inet_ntop(AF_INET, &(addr_in->sin_addr), abuf, INET_ADDRSTRLEN); + assert(result); + break; + } + case AF_INET6: { + struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr; + const char* result = inet_ntop(AF_INET6, &(addr_in6->sin6_addr), abuf, INET6_ADDRSTRLEN); + assert(result); + break; + } + default: + strncpy(abuf, "Unknown AF", INET6_ADDRSTRLEN); + break; + } + + fprintf(f, "%s ", abuf); vfprintf(f, fmt, ap); fprintf(f, "\n"); }