Merge commit 'danieldg/out-12'

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10732 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 4 insertions, 0 deletions

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 961156ae6..313396ed7 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -128,6 +128,10 @@ void ListenSocketBase::AcceptInternal()
 	if (this->family == AF_INET6)
 	{
 		inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+		if (!strncmp(buf, "::ffff:", 7))
+		{
+			memmove(buf, buf+7, sizeof(buf)-7);
+		}
 		socklen_t raddrsz = sizeof(sockaddr_in6);
 		if (getsockname(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
 			inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));