Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strip the prefix from ipv4-mapped addresses #73

Merged
merged 2 commits into from
Mar 3, 2025
+6 −2
Merged

strip the prefix from ipv4-mapped addresses #73

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5256307
cast addr to new variable in6_addr
eworm-de Jan 27, 2025
81badcb
strip the prefix from ipv4-mapped addresses
eworm-de Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
strip the prefix from ipv4-mapped addresses 
This allows to have plain IPv4 addresses in log, even if listening
on an IPv6 socket.

Before:

    ::ffff:10.7.7.72 - - [24/Jan/2025:22:15:54 +0100] "GET /archive.tar.zst HTTP/1.1" 200 72194 "" "pacredir/0.4.8 (arch/x86_64)"

After:

    10.7.7.72 - - [24/Jan/2025:22:15:54 +0100] "GET /archive.tar.zst HTTP/1.1" 200 72194 "" "pacredir/0.4.8 (arch/x86_64)"
  • Loading branch information
@eworm-de
eworm-de committed Jan 27, 2025
commit 81badcb569fdd3e4274e4107d8b0c2749e66022e
4 changes: 4 additions & 0 deletions darkhttpd.c
View file
Original file line number Diff line number Diff line change
@@ -799,6 +799,10 @@ static const char *get_address_text(const void *addr) {
static char text_addr[INET6_ADDRSTRLEN];
const struct in6_addr *in6_addr = addr;
inet_ntop(AF_INET6, in6_addr, text_addr, INET6_ADDRSTRLEN);
/* IPv4 addresses via dual stack result in mapped IPv6 addresses.
Strip the prefix (::ffff:) for plain IPv4 addresses. */
if (IN6_IS_ADDR_V4MAPPED(in6_addr))
return text_addr + 7;
return text_addr;
} else
#endif