Fix merge snafu in last commit. (Oops.)

[cubemap] / client.cpp

diff --git a/client.cpp b/client.cpp
index 28e1f068550e30e8da2492599401d135e2db109b..04518c8c2f58a97e9afcd877b77c91863d319bcc 100644 (file)
--- a/client.cpp
+++ b/client.cpp
@@ -1,6 +1,6 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <stdio.h>
+#include <stdint.h>
 #include <sys/socket.h>
 
 #include "client.h"
@@ -32,8 +32,19 @@ Client::Client(int sock)
        if (getpeername(sock, reinterpret_cast<sockaddr *>(&addr), &addr_len) == -1) {
                log_perror("getpeername");
                remote_addr = "";
+               return;
+       }
+
+       char buf[INET6_ADDRSTRLEN];
+       if (IN6_IS_ADDR_V4MAPPED(&addr.sin6_addr)) {
+               // IPv4 address, really.
+               if (inet_ntop(AF_INET, &addr.sin6_addr.s6_addr32[3], buf, sizeof(buf)) == NULL) {
+                       log_perror("inet_ntop");
+                       remote_addr = "";
+               } else {
+                       remote_addr = buf;
+               }
        } else {
-               char buf[INET6_ADDRSTRLEN];
                if (inet_ntop(addr.sin6_family, &addr.sin6_addr, buf, sizeof(buf)) == NULL) {
                        log_perror("inet_ntop");
                        remote_addr = "";