X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=75a9eaf4f2258127ee53dd3c6b8542e61c7c1f35;hb=f8d9c513174926eae5b0545c56c310c90f295132;hp=c42e8bd640148fabbe15def8668668b8469c6f7a;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index c42e8bd64..75a9eaf4f 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -302,7 +302,6 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
 		return -1;
 
 	const char * opt = ___argv[arg_counter];
-	int return_val = 0;
 
 	// if we're not an option, return an error.
 	if (strnicmp(opt, "--", 2) != 0)
@@ -364,21 +363,7 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
 	return 1;
 }
 
-/* IPC Messages */
-#define IPC_MESSAGE_REHASH	1
-#define IPC_MESSAGE_DIE		2
-#define IPC_MESSAGE_RESTART	3
-
-IPC::IPC(InspIRCd* Srv) : Instance(Srv)
-{
-	static DWORD buflen = 1024;
-	static const char * pipename = "\\\\.\\mailslot\\Inspircd";
-	hIPCPipe = CreateMailslot(pipename, buflen, 0, 0);
-	if (hIPCPipe == INVALID_HANDLE_VALUE)
-		printf("IPC Pipe could not be created. Are you sure you didn't start InspIRCd twice?\n");
-}
-
-void IPC::Check()
+/*void IPC::Check()
 {
 	if (hIPCPipe == INVALID_HANDLE_VALUE)
 		return;
@@ -390,14 +375,14 @@ void IPC::Check()
 	if (!res)
 	{
 		if (GetLastError() != ERROR_SEM_TIMEOUT)
-			Instance->Log(DEFAULT, "IPC Pipe Error %u: %s", GetLastError(), dlerror());
+			Instance->Logs->Log("win32",DEFAULT, "IPC Pipe Error %u: %s", GetLastError(), dlerror());
 		return;
 	}
 
 	switch (action)
 	{
 		case IPC_MESSAGE_REHASH:
-			Instance->Rehash();
+			Instance->Rehash("due to IPC message");
 		break;
 		
 		case IPC_MESSAGE_DIE:
@@ -408,12 +393,7 @@ void IPC::Check()
 			Instance->Restart("IPC_MESSAGE_RESTART received by mailslot.");
 		break;
 	}
-}
-
-IPC::~IPC()
-{
-	CloseHandle(hIPCPipe);
-}
+}*/
 
 
 /* These three functions were created from looking at how ares does it
@@ -523,7 +503,7 @@ void ClearConsole()
  */
 void ChangeWindowsSpecificPointers(InspIRCd* Instance)
 {
-	Instance->Log(DEBUG,"Changing to windows specific pointer and functor set");
+	Instance->Logs->Log("win32",DEBUG,"Changing to windows specific pointer and functor set");
 	Instance->Config->DNSServerValidator = &ValidateWindowsDnsServer;
 }
 
@@ -631,7 +611,7 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v
 	if (!*(data.GetString()))
 	{
 		std::string nameserver;
-		conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in the registry...");
+		conf->GetInstance()->Logs->Log("win32",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in the registry...");
 		nameserver = FindNameServerWin();
 		/* Windows stacks multiple nameservers in one registry key, seperated by commas.
 		 * Spotted by Cataclysm.
@@ -644,7 +624,7 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v
 		if (nameserver.find(' ') != std::string::npos)
 			nameserver = nameserver.substr(0, nameserver.find(' '));
 		data.Set(nameserver.c_str());
-		conf->GetInstance()->Log(DEFAULT,"<dns:server> set to '%s' as first active resolver in registry.", nameserver.c_str());
+		conf->GetInstance()->Logs->Log("win32",DEFAULT,"<dns:server> set to '%s' as first active resolver in registry.", nameserver.c_str());
 	}
 	return true;
 }