* Initial work on IPv6-enabling citserver

[citadel.git] / citadel / locate_host.c

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index 0331d82df174d7b8efbfa95ea47593f554fa276d..d8a2c5b919f1def7cbd3b5923d62542a49fccea0 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -49,6 +49,11 @@ void locate_host(char *tbuf, size_t n, char *abuf, size_t na, int client_socket)
        getpeername(client_socket, (struct sockaddr *)&clientaddr, &addrlen);
        getnameinfo((struct sockaddr *)&clientaddr, addrlen, tbuf, n, NULL, 0, 0);
        getnameinfo((struct sockaddr *)&clientaddr, addrlen, abuf, na, NULL, 0, NI_NUMERICHOST);
+
+       /* Convert IPv6-mapped IPv4 addresses back to traditional dotted quad */
+       if ( (strlen(abuf) > 7) && (!strncasecmp(abuf, "::ffff:", 7)) ) {
+               strcpy(abuf, &abuf[7]);
+       }
 }