thac0/gmnisrv
1
0
Fork 0
forked from aniani/gmnisrv
Code Pull Requests Activity

Fix IP address logging

Browse Source 
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"
This commit is contained in:
Nolan Prescott 2020-12-18 21:30:42 -05:00 committed by Drew DeVault
parent cb2c84b0ad
commit 61bf4c53aa
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/log.c
View File

@ -1,6 +1,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "log.h" #include "log.h"
@ -17,11 +18,26 @@ static void
client_logf(FILE *f, struct sockaddr *addr, const char *fmt, va_list ap) client_logf(FILE *f, struct sockaddr *addr, const char *fmt, va_list ap)
{ {
char abuf[INET6_ADDRSTRLEN + 1]; 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); vfprintf(f, fmt, ap);
fprintf(f, "\n"); fprintf(f, "\n");
} }