diff options
| -rw-r--r-- | source/Globals.h | 3 | ||||
| -rw-r--r-- | source/OSSupport/Socket.cpp | 20 |
2 files changed, 20 insertions, 3 deletions
diff --git a/source/Globals.h b/source/Globals.h index 038b173cf..c9589bfc5 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -92,6 +92,9 @@ typedef unsigned short UInt16; // OS-dependent stuff: #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN + + #define _WIN32_WINNT 0x501 // We want to target WinXP and higher + #include <Windows.h> #include <winsock2.h> #include <Ws2tcpip.h> // IPv6 stuff diff --git a/source/OSSupport/Socket.cpp b/source/OSSupport/Socket.cpp index efc20284f..b4ac62993 100644 --- a/source/OSSupport/Socket.cpp +++ b/source/OSSupport/Socket.cpp @@ -293,9 +293,23 @@ cSocket cSocket::AcceptIPv6(void) // Get IP in string form: if (SClient.IsValid()) { - char buffer[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, &(from.sin6_addr), buffer, sizeof(buffer)); - SClient.m_IPString.assign(buffer); + #if defined(_WIN32) + // Windows XP doesn't have inet_ntop, so we need to improvise: + Printf(SClient.m_IPString, "%x:%x:%x:%x:%x:%x:%x:%x", + from.sin6_addr.u.Word[0], + from.sin6_addr.u.Word[1], + from.sin6_addr.u.Word[2], + from.sin6_addr.u.Word[3], + from.sin6_addr.u.Word[4], + from.sin6_addr.u.Word[5], + from.sin6_addr.u.Word[6], + from.sin6_addr.u.Word[7] + ); + #else + char buffer[INET6_ADDRSTRLEN]; + inet_ntop(AF_INET6, &(from.sin6_addr), buffer, sizeof(buffer)); + SClient.m_IPString.assign(buffer); + #endif // _WIN32 } return SClient; } |