X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=3e0a264a58366764d93a07f05b00da711323ba9a;hb=8f5efbc7aa33b792e02d01e3288f553e6e98ccaa;hp=ebc49852934409eb55d04c2e4303effa0c6fa201;hpb=8d419c3873cd3593baf4cc5f66bbe854a3a4614f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index ebc498529..3e0a264a5 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -22,6 +22,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd_win32wrapper.h"
 #include "inspircd.h"
 #include "configreader.h"
@@ -38,8 +39,8 @@ CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, sockle
 		memset(&in, 0, sizeof(in));
 		in.sin_family = AF_INET;
 		memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-		getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-		return dst;
+		if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
+			return dst;
 	}
 	else if (af == AF_INET6)
 	{
@@ -47,26 +48,46 @@ CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, sockle
 		memset(&in, 0, sizeof(in));
 		in.sin6_family = AF_INET6;
 		memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
-		getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-		return dst;
+		if (getnameinfo((struct sockaddr *)&in, sizeof(struct sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST) == 0)
+			return dst;
 	}
 	return NULL;
 }
 
 CoreExport int insp_inet_pton(int af, const char *src, void *dst)
 {
-	sockaddr_in sa;
-	int len = sizeof(SOCKADDR);
-	int rv = WSAStringToAddressA((LPSTR)src, af, NULL, (LPSOCKADDR)&sa, &len);
-	if(rv >= 0)
+	int address_length;
+	sockaddr_storage sa;
+	sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(&sa);
+	sockaddr_in6* sin6 = reinterpret_cast<sockaddr_in6*>(&sa);
+
+	switch (af)
 	{
-		if(WSAGetLastError() == WSAEINVAL)
-			rv = 0;
-		else
-			rv = 1;
+		case AF_INET:
+			address_length = sizeof(sockaddr_in);
+			break;
+		case AF_INET6:
+			address_length = sizeof(sockaddr_in6);
+			break;
+		default:
+			return -1;
 	}
-	memcpy(dst, &sa.sin_addr, sizeof(struct in_addr));
-	return rv;
+
+	if (!WSAStringToAddress(static_cast<LPSTR>(const_cast<char *>(src)), af, NULL, reinterpret_cast<LPSOCKADDR>(&sa), &address_length))
+	{
+		switch (af)
+		{
+			case AF_INET:
+				memcpy(dst, &sin->sin_addr, sizeof(in_addr));
+				break;
+			case AF_INET6:
+				memcpy(dst, &sin6->sin6_addr, sizeof(in6_addr));
+				break;
+		}
+		return 1;
+	}
+
+	return 0;
 }
 
 CoreExport DIR * opendir(const char * path)
@@ -143,7 +164,7 @@ int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, cons
 //					optind++;		// Trash this next argument, we won't be needing it.
 					par = ___argv[optind-1];
 				}
-			}			
+			}
 
 			// increment the argument for next time
 //			optind++;
@@ -169,9 +190,9 @@ int getopt_long(int ___argc, char *const *___argv, const char *__shortopts, cons
 			{
 				if (__longopts[i].val == -1 || par == 0)
 					return 1;
-				
+
 				return __longopts[i].val;
-			}			
+			}
 			break;
 		}
 	}
@@ -185,6 +206,11 @@ CWin32Exception::CWin32Exception() : exception()
 	dwErrorCode = GetLastError();
 	if( FormatMessageA( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)szErrorString, _countof(szErrorString), NULL) == 0 )
 		sprintf_s(szErrorString, _countof(szErrorString), "Error code: %u", dwErrorCode);
+	for (size_t i = 0; i < _countof(szErrorString); i++)
+	{
+		if ((szErrorString[i] == '\r') || (szErrorString[i] == '\n'))
+			szErrorString[i] = 0;
+	}
 }
 
 CWin32Exception::CWin32Exception(const CWin32Exception& other)
@@ -201,10 +227,3 @@ DWORD CWin32Exception::GetErrorCode()
 {
 	return dwErrorCode;
 }
-
-#include "../src/modules/m_spanningtree/link.h"
-#include "../src/modules/ssl.h"
-template class reference<Link>;
-template class reference<Autoconnect>;
-template class reference<ssl_cert>;
-template class reference<OperInfo>;