X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=fc739f9bd17916ecb8c083d097efa3dec461094d;hb=124c17e14134a4999afc1a5e981ab7c75b3694b9;hp=4592aa5d17c2b27eee0f6e86adc3891b5cbf4be9;hpb=fc198fffe16fed4d9c8863e0571c5f314aaa5147;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index 4592aa5d1..fc739f9bd 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"
@@ -29,66 +30,6 @@
 #include <errno.h>
 #include <assert.h>
 
-CoreExport const char *insp_inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
-{
-
-	if (af == AF_INET)
-	{
-		struct sockaddr_in in;
-		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;
-	}
-	else if (af == AF_INET6)
-	{
-		struct sockaddr_in6 in;
-		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;
-	}
-	return NULL;
-}
-
-CoreExport int insp_inet_pton(int af, const char *src, void *dst)
-{
-	int address_length;
-	sockaddr_storage sa;
-	sockaddr_in* sin = reinterpret_cast<sockaddr_in*>(&sa);
-	sockaddr_in6* sin6 = reinterpret_cast<sockaddr_in6*>(&sa);
-
-	switch (af)
-	{
-		case AF_INET:
-			address_length = sizeof(sockaddr_in);
-			break;
-		case AF_INET6:
-			address_length = sizeof(sockaddr_in6);
-			break;
-		default:
-			return -1;
-	}
-
-	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)
 {
 	std::string search_path = std::string(path) + "\\*.*";
@@ -163,7 +104,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++;
@@ -189,9 +130,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;
 		}
 	}
@@ -205,6 +146,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)
@@ -221,10 +167,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>;