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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions darkhttpd.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,12 @@ static const char *get_address_text(const void *addr) {
#ifdef HAVE_INET6
if (inet6) {
static char text_addr[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, (const struct in6_addr *)addr, 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
Expand Down