* include/caller.h will now compile correctly on Windows platforms.

[user/henk/code/inspircd.git] / win / inspircd_win32wrapper.cpp

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index ee1d54c25dc99993bf29e3ff25e71fdf8d352654..e6f25df18f8d33837b4ea7a2401abec89accfb68 100644 (file)
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -13,15 +13,19 @@
 
 #include "inspircd_win32wrapper.h"
 #include "inspircd.h"
+#include "configreader.h"
 #include <string>
 #include <errno.h>
 #include <assert.h>
+#pragma comment(lib, "winmm.lib")
 using namespace std;
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
 #endif
 
+#include <mmsystem.h>
+
 /* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */
 static DWORD owner_processid = 0;
 
@@ -365,7 +369,7 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts,
 #define IPC_MESSAGE_DIE                2
 #define IPC_MESSAGE_RESTART    3
 
-void InitIPC()
+IPC::IPC(InspIRCd* Srv) : Instance(Srv)
 {
        static DWORD buflen = 1024;
        static const char * pipename = "\\\\.\\mailslot\\Inspircd";
@@ -374,7 +378,7 @@ void InitIPC()
                printf("IPC Pipe could not be created. Are you sure you didn't start InspIRCd twice?\n");
 }
 
-void CheckIPC(InspIRCd * Instance)
+void IPC::Check()
 {
        if (hIPCPipe == INVALID_HANDLE_VALUE)
                return;
@@ -393,7 +397,7 @@ void CheckIPC(InspIRCd * Instance)
        switch (action)
        {
                case IPC_MESSAGE_REHASH:
-                       Instance->Rehash(0);
+                       Instance->Rehash();
                break;
                
                case IPC_MESSAGE_DIE:
@@ -406,7 +410,7 @@ void CheckIPC(InspIRCd * Instance)
        }
 }
 
-void CloseIPC()
+IPC::~IPC()
 {
        CloseHandle(hIPCPipe);
 }
@@ -514,7 +518,16 @@ void ClearConsole()
        return;
 }
 
-DWORD WindowsForkStart(InspIRCd * Instance)
+/* Many inspircd classes contain function pointers/functors which can be changed to point at platform specific implementations
+ * of code. This function repoints these pointers and functors so that calls are windows specific.
+ */
+void ChangeWindowsSpecificPointers(InspIRCd* Instance)
+{
+       Instance->Log(DEBUG,"Changing to windows specific pointer and functor set");
+       Instance->Config->DNSServerValidator = &ValidateWindowsDnsServer;
+}
+
+DWORD WindowsForkStart(InspIRCd* Instance)
 {
         /* Windows implementation of fork() :P */
        if (owner_processid)
@@ -613,4 +626,31 @@ void WindowsForkKillOwner(InspIRCd * Instance)
         CloseHandle(hProcess);
 }
 
+bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+{
+       if (!*(data.GetString()))
+       {
+               std::string nameserver;
+               conf->GetInstance()->Log(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.
+                */
+               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());
+       }
+       return true;
+}
+
+int gettimeofday(struct timeval * tv, void * tz)
+{
+       if(tv == NULL)
+               return -1;
 
+       DWORD mstime = timeGetTime();
+       tv->tv_sec   = time(NULL);
+       tv->tv_usec  = (mstime - (tv->tv_sec * 1000)) * 1000;
+    return 0;  
+}