X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=d82c90a61be9d6a99f380e507d01e03e25afdc99;hb=82a3069c5604a8b815021532ebfcc98cb50c9c7d;hp=534ee5a319d10f3797163cf3a92129d9ed56d004;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index 534ee5a31..d82c90a61 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -46,7 +46,7 @@ int inet_aton(const char *cp, struct in_addr *addr) return (addr->s_addr == INADDR_NONE) ? 0 : 1; } -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) +const char *insp_inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { if (af == AF_INET) @@ -75,7 +75,7 @@ int geteuid() return 1; } -int inet_pton(int af, const char *src, void *dst) +int insp_inet_pton(int af, const char *src, void *dst) { sockaddr_in sa; int len = sizeof(SOCKADDR); @@ -236,16 +236,17 @@ int printf_c(const char * format, ...) return c; } -int arg_counter = 1; +int optind = 1; char optarg[514]; int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind) { // burlex todo: handle the shortops, at the moment it only works with longopts. - if (___argc == 1 || arg_counter == ___argc) // No arguments (apart from filename) + if (___argc == 1 || optind == ___argc) // No arguments (apart from filename) return -1; - const char * opt = ___argv[arg_counter]; + const char * opt = ___argv[optind]; + optind++; // if we're not an option, return an error. if (strnicmp(opt, "--", 2) != 0) @@ -262,18 +263,18 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts, { // woot, found a valid argument =) char * par = 0; - if ((arg_counter + 1) != ___argc) + if ((optind) != ___argc) { // grab the parameter from the next argument (if its not another argument) - if (strnicmp(___argv[arg_counter+1], "--", 2) != 0) + if (strnicmp(___argv[optind], "--", 2) != 0) { - arg_counter++; // Trash this next argument, we won't be needing it. - par = ___argv[arg_counter]; +// optind++; // Trash this next argument, we won't be needing it. + par = ___argv[optind-1]; } } // increment the argument for next time - arg_counter++; +// optind++; // determine action based on type if (__longopts[i].has_arg == required_argument && !par) @@ -307,39 +308,6 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts, return 1; } -/*void IPC::Check() -{ - if (hIPCPipe == INVALID_HANDLE_VALUE) - return; - - DWORD bytes; - DWORD action; - - BOOL res = ReadFile(hIPCPipe, &action, sizeof(DWORD), &bytes, 0); - if (!res) - { - if (GetLastError() != ERROR_SEM_TIMEOUT) - Instance->Logs->Log("win32",DEFAULT, "IPC Pipe Error %u: %s", GetLastError(), dlerror()); - return; - } - - switch (action) - { - case IPC_MESSAGE_REHASH: - Instance->Rehash("due to IPC message"); - break; - - case IPC_MESSAGE_DIE: - Instance->Exit(0); - break; - - case IPC_MESSAGE_RESTART: - Instance->Restart("IPC_MESSAGE_RESTART received by mailslot."); - break; - } -}*/ - - /* These three functions were created from looking at how ares does it * (...and they look far tidier in C++) */ @@ -386,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; @@ -445,13 +413,12 @@ void ClearConsole() /* 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) +void ChangeWindowsSpecificPointers() { - Instance->Logs->Log("win32",DEBUG,"Changing to windows specific pointer and functor set"); - Instance->Config->DNSServerValidator = &ValidateWindowsDnsServer; + ServerInstance->Logs->Log("win32",DEBUG,"Changing to windows specific pointer and functor set"); } -DWORD WindowsForkStart(InspIRCd* Instance) +DWORD WindowsForkStart() { /* Windows implementation of fork() :P */ if (owner_processid) @@ -531,56 +498,65 @@ DWORD WindowsForkStart(InspIRCd* Instance) return ExitCode; } -void WindowsForkKillOwner(InspIRCd * Instance) +void WindowsForkKillOwner() { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, owner_processid); if(!hProcess || !owner_processid) { printf("Could not open process id %u: %s.\n", owner_processid, dlerror()); - Instance->Exit(14); + ServerInstance->Exit(14); } // die die die if(!TerminateProcess(hProcess, 0)) { printf("Could not TerminateProcess(): %s\n", dlerror()); - Instance->Exit(14); + ServerInstance->Exit(14); } CloseHandle(hProcess); } -bool ValidateWindowsDnsServer(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: 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; - conf->GetInstance()->Logs->Log("win32",DEFAULT,"WARNING: 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()); - conf->GetInstance()->Logs->Log("win32",DEFAULT," 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," 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; } @@ -656,67 +632,67 @@ void donewmi() int getcpu() { HRESULT hres; + int cpu = -1; /* Use WQL, similar to SQL, to construct a query that lists the cpu usage and pid of all processes */ IEnumWbemClassObject* pEnumerator = NULL; - hres = pSvc->ExecQuery(bstr_t("WQL"), - bstr_t("Select PercentProcessorTime,IDProcess from Win32_PerfFormattedData_PerfProc_Process"), - WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator); - - /* Query didn't work */ - if (FAILED(hres)) - return -1; - IWbemClassObject *pclsObj = NULL; - ULONG uReturn = 0; - - /* Iterate the query results */ - while (pEnumerator) - { - VARIANT vtProp; - /* Next item */ - HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn); + BSTR Language = SysAllocString(L"WQL"); + BSTR Query = SysAllocString(L"Select PercentProcessorTime,IDProcess from Win32_PerfFormattedData_PerfProc_Process"); - /* No more items left */ - if (uReturn == 0) - break; + hres = pSvc->ExecQuery(Language, Query, WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, NULL, &pEnumerator); + + /* Query didn't work */ + if (!FAILED(hres)) + { + IWbemClassObject *pclsObj = NULL; + ULONG uReturn = 0; - /* Find process ID */ - hr = pclsObj->Get(L"IDProcess", 0, &vtProp, 0, 0); - if (!FAILED(hr)) + /* Iterate the query results */ + while (pEnumerator) { - /* Matches our process ID? */ - if (vtProp.uintVal == GetCurrentProcessId()) + VARIANT vtProp; + VariantInit(&vtProp); + /* Next item */ + HRESULT hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn); + + /* No more items left */ + if (uReturn == 0) + break; + + /* Find process ID */ + hr = pclsObj->Get(L"IDProcess", 0, &vtProp, 0, 0); + if (!FAILED(hr)) { + /* Matches our process ID? */ + UINT pid = vtProp.uintVal; VariantClear(&vtProp); - /* Get CPU percentage for this process */ - hr = pclsObj->Get(L"PercentProcessorTime", 0, &vtProp, 0, 0); - if (!FAILED(hr)) - { - /* Deal with wide string ickyness. Who in their right - * mind puts a number in a bstrVal wide string item?! - */ - VariantClear(&vtProp); - int cpu = 0; - std::wstringstream out(vtProp.bstrVal); - out >> cpu; - pEnumerator->Release(); + if (pid == GetCurrentProcessId()) + { + /* Get CPU percentage for this process */ + hr = pclsObj->Get(L"PercentProcessorTime", 0, &vtProp, 0, 0); + if (!FAILED(hr)) + { + /* Deal with wide string ickyness. Who in their right + * mind puts a number in a bstrVal wide string item?! + */ + cpu = 0; + std::wstringstream out(vtProp.bstrVal); + out >> cpu; + VariantClear(&vtProp); + } pclsObj->Release(); - return cpu; + break; } + pclsObj->Release(); } } - } - pEnumerator->Release(); - pclsObj->Release(); - return -1; -} -void usleep(unsigned long usecs) -{ - if (usecs > 0UL) - { - unsigned long millis = ((usecs + 999UL) / 1000UL); - SleepEx(millis, false); + pEnumerator->Release(); } + + SysFreeString(Language); + SysFreeString(Query); + + return cpu; }