* Revert RakNetSocket2 implementation.

It breaks Windows XP compatibility by depending on inet_ntop. Please fix!

thirdparty/raknet/RakNetSocket2.cpp

@@ -74,7 +74,7 @@ RakNetSocket2* RakNetSocket2Allocator::AllocRNS2(void)
 	s2 = RakNet::OP_NEW<RNS2_WindowsStore8>(_FILE_AND_LINE_);
 	s2->SetSocketType(RNS2T_WINDOWS_STORE_8);
 
-
+	
 
 
 

thirdparty/raknet/RakNetSocket2_Berkley_NativeClient.cpp

@@ -1,16 +1,11 @@
 /*
- *  Original work: Copyright (c) 2014, Oculus VR, Inc.
+ *  Copyright (c) 2014, Oculus VR, Inc.
  *  All rights reserved.
  *
  *  This source code is licensed under the BSD-style license found in the
- *  RakNet License.txt file in the licenses directory of this source tree. An additional grant
- *  of patent rights can be found in the RakNet Patents.txt file in the same directory.
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
  *
- *
- *  Modified work: Copyright (c) 2016-2020, SLikeSoft UG (haftungsbeschränkt)
- *
- *  This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style
- *  license found in the license.txt file in the root directory of this source tree.
  */
 
 #include "EmptyHeader.h"
@@ -20,102 +15,87 @@
 #ifndef RAKNETSOCKET2_BERKLEY_NATIVE_CLIENT_CPP
 #define RAKNETSOCKET2_BERKLEY_NATIVE_CLIENT_CPP
 
-// Every platform except windows store 8 and native client supports Berkley sockets
+ // Every platform except windows store 8 and native client supports Berkley sockets
 #if !defined(WINDOWS_STORE_RT)
 
 #include "Itoa.h"
-#include "WSAStartupSingleton.h" // used for WSAStartupSingleton
-
-#if (defined(__GNUC__)  || defined(__GCCXML__)) && !defined(__WIN32__)
-#include <netdb.h>
-#endif
 
 // Shared on most platforms, but excluded from the listed
 
-// #low - maybe change to char (&ip)[65] - then we can also use sizeof again
-void DomainNameToIP_Berkley_IPV4And6( const char *domainName, char ip[65] )
+
+void DomainNameToIP_Berkley_IPV4And6(const char* domainName, char ip[65])
 {
 #if RAKNET_SUPPORT_IPV6==1
-	struct addrinfo hints, *res, *p;
+	struct addrinfo hints, * res, * p;
 	int status;
 	memset(&hints, 0, sizeof hints);
 	hints.ai_family = AF_UNSPEC; // AF_INET or AF_INET6 to force version
 	hints.ai_socktype = SOCK_DGRAM;
-
-	if ((status = getaddrinfo(domainName, nullptr, &hints, &res)) != 0) {
-		// #high - review/update callers - some unnecessarily initialize ip unnecessarily
-		ip[0] = '\0';
+
+	if ((status = getaddrinfo(domainName, NULL, &hints, &res)) != 0) {
+		memset(ip, 0, sizeof(ip));
 		return;
 	}
-	
-	p=res;
-	// 	for(p = res;p != nullptr; p = p->ai_next) {
-	void *addr;
+
+	p = res;
+	// 	for(p = res;p != NULL; p = p->ai_next) {
+	void* addr;
 	//		char *ipver;
-	
-	// get the pointer to the address itself,
-	// different fields in IPv4 and IPv6:
+
+			// get the pointer to the address itself,
+			// different fields in IPv4 and IPv6:
 	if (p->ai_family == AF_INET)
 	{
-		struct sockaddr_in *ipv4 = (struct sockaddr_in *)p->ai_addr;
+		struct sockaddr_in* ipv4 = (struct sockaddr_in*)p->ai_addr;
 		addr = &(ipv4->sin_addr);
-		inet_ntop(AF_INET, &ipv4->sin_addr, ip, 65);
+		strcpy(ip, inet_ntoa(ipv4->sin_addr));
 	}
 	else
 	{
 		// TODO - test
-		struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)p->ai_addr;
+		struct sockaddr_in6* ipv6 = (struct sockaddr_in6*)p->ai_addr;
 		addr = &(ipv6->sin6_addr);
 		// inet_ntop function does not exist on windows
 		// http://www.mail-archive.com/[email protected]/msg02107.html
-		getnameinfo((struct sockaddr *)ipv6, sizeof(struct sockaddr_in6), ip, sizeof(ip), nullptr, 0, NI_NUMERICHOST);
+		getnameinfo((struct sockaddr*)ipv6, sizeof(struct sockaddr_in6), ip, 1, NULL, 0, NI_NUMERICHOST);
 	}
 	freeaddrinfo(res); // free the linked list
 	//	}
 #else
-	(void) domainName;
-	(void) ip;
+	(void)domainName;
+	(void)ip;
 #endif // #if RAKNET_SUPPORT_IPV6==1
 }
 
 
-void DomainNameToIP_Berkley_IPV4( const char *domainName, char ip[65] )
+void DomainNameToIP_Berkley_IPV4(const char* domainName, char ip[65])
 {
+	static struct in_addr addr;
+	memset(&addr, 0, sizeof(in_addr));
+
 	// Use inet_addr instead? What is the difference?
-	struct addrinfo *addressinfo = nullptr;
-	// needed for getaddrinfo
-	WSAStartupSingleton::AddRef();
-	int error = getaddrinfo(domainName, nullptr, nullptr, &addressinfo);
-	WSAStartupSingleton::Deref();
-
-	if ( error != 0 || addressinfo == 0 )
+	struct hostent* phe = gethostbyname(domainName);
+
+	if (phe == 0 || phe->h_addr_list[0] == 0)
 	{
 		//cerr << "Yow! Bad host lookup." << endl;
-		// #high - review/update callers - some unnecessarily initialize ip unnecessarily
-		ip[0] = '\0';
+		memset(ip, 0, 65 * sizeof(char));
 		return;
 	}
-
-	// get the (first) IPv4 address
-	while (addressinfo != nullptr) {
-		if (addressinfo->ai_family == AF_INET) {
-			break; // found an IPv4 address
-		}
-		addressinfo = addressinfo->ai_next;
-	}
-
-	if (addressinfo == nullptr) {
+
+	if (phe->h_addr_list[0] == 0)
+	{
+		memset(ip, 0, 65 * sizeof(char));
 		return;
 	}
-
-	struct sockaddr_in  *sockaddr_ipv4 = (struct sockaddr_in *) addressinfo->ai_addr;
-
-	inet_ntop(AF_INET, &sockaddr_ipv4->sin_addr, ip, 65);
+
+	memcpy(&addr, phe->h_addr_list[0], sizeof(struct in_addr));
+	strcpy(ip, inet_ntoa(addr));
 }
 
 
 
-void DomainNameToIP_Berkley( const char *domainName, char ip[65] )
+void DomainNameToIP_Berkley(const char* domainName, char ip[65])
 {
 #if RAKNET_SUPPORT_IPV6==1
 	return DomainNameToIP_Berkley_IPV4And6(domainName, ip);
@@ -131,4 +111,4 @@ void DomainNameToIP_Berkley( const char *domainName, char ip[65] )
 
 #endif // file header
 
-#endif // #ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS
+#endif // #ifdef RAKNET_SOCKET_2_INLINE_FUNCTIONS