std::string FindNameServerWin()
{
- std::string returnval = "127.0.0.1";
+ std::string returnval;
HKEY top, key;
char* dns = NULL;
/* 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)
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: <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;
- 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.
- */
- 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,"<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)