X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=d82c90a61be9d6a99f380e507d01e03e25afdc99;hb=82a3069c5604a8b815021532ebfcc98cb50c9c7d;hp=eb73378f2fc1881d70272f90ff319bfdb7f1ec0b;hpb=1312f2db8ed90464e73acdcc07bb1aae92964345;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp
index eb73378f2..d82c90a61 100644
--- a/win/inspircd_win32wrapper.cpp
+++ b/win/inspircd_win32wrapper.cpp
@@ -147,30 +147,6 @@ const char * dlerror()
 	return errormessage;
 }
 
-ssize_t writev(int fd, const struct iovec* iov, int iovcnt)
-{
-    ssize_t ret;
-    size_t tot = 0;
-    int i;
-    char *buf, *p;
-
-    for(i = 0; i < iovcnt; ++i)
-        tot += iov[i].iov_len;
-    buf = (char*)malloc(tot);
-    if (tot != 0 && buf == NULL) {
-        errno = ENOMEM;
-        return -1;
-    }
-    p = buf;
-    for (i = 0; i < iovcnt; ++i) {
-        memcpy (p, iov[i].iov_base, iov[i].iov_len);
-        p += iov[i].iov_len;
-    }
-    ret = send((SOCKET)fd, buf, tot, 0);
-    free (buf);
-    return ret;
-}
-
 #define TRED FOREGROUND_RED | FOREGROUND_INTENSITY
 #define TGREEN FOREGROUND_GREEN | FOREGROUND_INTENSITY
 #define TYELLOW FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY
@@ -378,7 +354,7 @@ bool GetInterface(HKEY regkey, const char *key, char* &output)
 
 std::string FindNameServerWin()
 {
-	std::string returnval = "127.0.0.1";
+	std::string returnval;
 	HKEY top, key;
 	char* dns = NULL;
 
@@ -541,37 +517,46 @@ void WindowsForkKillOwner()
         CloseHandle(hProcess);
 }
 
-bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+void FindDNS(std::string& server)
 {
-	if (!*(data.GetString()))
+	if (!server.empty())
+		return;
+
+	ServerInstance->Logs->Log("CONFIG",DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in the registry...");
+	std::string nameserver = FindNameServerWin();
+
+	/* If empty use default to 127.0.0.1 */
+	if (nameserver.empty())
 	{
-		std::string nameserver;
-		ServerInstance->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.
-		 */
-		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());
-		ServerInstance->Logs->Log("win32",DEFAULT,"<dns:server> set to '%s' as first active resolver in registry.", nameserver.c_str());
+		ServerInstance->Logs->Log("CONFIG",DEFAULT,"No viable nameserver found in registry! Defaulting to nameserver '127.0.0.1'!");
+		server = "127.0.0.1";
+		return;
 	}
-	return true;
+
+	/* 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(','));
+
+	/* 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(' '));
+
+	server = nameserver;
+	ServerInstance->Logs->Log("CONFIG",DEFAULT,"<dns:server> set to '%s' as first active resolver in registry.", nameserver.c_str());
 }
 
-int gettimeofday(struct timeval * tv, void * tz)
+int clock_gettime(int clock, struct timespec * tv)
 {
 	if(tv == NULL)
 		return -1;
 
 	DWORD mstime = timeGetTime();
 	tv->tv_sec   = time(NULL);
-	tv->tv_usec  = (mstime - (tv->tv_sec * 1000)) * 1000;
+	tv->tv_usec  = (mstime - (tv->tv_sec * 1000)) * 1000000;
 	return 0;	
 }
 
@@ -667,6 +652,7 @@ int getcpu()
 		while (pEnumerator)
 		{
 			VARIANT vtProp;
+			VariantInit(&vtProp);
 			/* Next item */
 			HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
 
@@ -679,9 +665,10 @@ int getcpu()
 			if (!FAILED(hr))
 			{
 				/* Matches our process ID? */
-				if (vtProp.uintVal == GetCurrentProcessId())
-				{
-					VariantClear(&vtProp);
+				UINT pid = vtProp.uintVal;
+				VariantClear(&vtProp);
+				if (pid == GetCurrentProcessId())
+				{					
 					/* Get CPU percentage for this process */
 					hr = pclsObj->Get(L"PercentProcessorTime", 0, &vtProp, 0, 0);
 					if (!FAILED(hr))
@@ -689,18 +676,19 @@ int getcpu()
 						/* Deal with wide string ickyness. Who in their right
 						 * mind puts a number in a bstrVal wide string item?!
 						 */
-						VariantClear(&vtProp);
 						cpu = 0;
 						std::wstringstream out(vtProp.bstrVal);
 						out >> cpu;
-						break;
+						VariantClear(&vtProp);
 					}
+					pclsObj->Release();
+					break;
 				}
+				pclsObj->Release();
 			}
 		}
 
 		pEnumerator->Release();
-		pclsObj->Release();
 	}
 
 	SysFreeString(Language);