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

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index cc56af69d..c42e8bd64 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,12 +17,15 @@
 #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;
 
@@ -516,19 +519,16 @@ void ClearConsole()
 }
 
 /* Many inspircd classes contain function pointers/functors which can be changed to point at platform specific implementations
- * of code. This function, called from WindowsForkStart, repoints these pointers and functors so that calls are windows
- * specific.
+ * 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)
 {
-	/* See the function declaration above */
-	ChangeWindowsSpecificPointers(Instance);
-
         /* Windows implementation of fork() :P */
 	if (owner_processid)
 		return 0;
@@ -638,8 +638,24 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v
 		 */
 		if (nameserver.find(',') != std::string::npos)
 			nameserver = nameserver.substr(0, nameserver.find(','));
+		/* Just to be FUCKING AKWARD, windows fister... err i mean vista...
+		 * seperates the nameservers with spaces instead.
+		 */
+		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;	
+}