X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=6d0661fda668286ff68dd58dff415a02d161ae53;hb=bb35a0fa9cbebe51fa636f707c12ca4a7033dd9a;hp=c56744b40bae74672d5c043e5d6905e1b63e1805;hpb=c30a6f1a52a6d786bbea7c37e62ccb2a7106b3b7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index c56744b40..6d0661fda 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -39,110 +39,7 @@ #include "typedefs.h" #include "command_parse.h" #include "exitcodes.h" - -#ifdef WIN32 - -/* This MUST remain static and delcared outside the class, so that WriteProcessMemory can reference it properly */ -static DWORD owner_processid = 0; - -DWORD WindowsForkStart(InspIRCd * Instance) -{ - /* Windows implementation of fork() :P */ - - char module[MAX_PATH]; - if(!GetModuleFileName(NULL, module, MAX_PATH)) - { - printf("GetModuleFileName() failed.\n"); - return false; - } - - STARTUPINFO startupinfo; - PROCESS_INFORMATION procinfo; - ZeroMemory(&startupinfo, sizeof(STARTUPINFO)); - ZeroMemory(&procinfo, sizeof(PROCESS_INFORMATION)); - - // Fill in the startup info struct - GetStartupInfo(&startupinfo); - - /* Default creation flags create the processes suspended */ - DWORD startupflags = CREATE_SUSPENDED; - - /* On windows 2003/XP and above, we can use the value - * CREATE_PRESERVE_CODE_AUTHZ_LEVEL which gives more access - * to the process which we may require on these operating systems. - */ - OSVERSIONINFO vi; - vi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&vi); - if ((vi.dwMajorVersion >= 5) && (vi.dwMinorVersion > 0)) - startupflags |= CREATE_PRESERVE_CODE_AUTHZ_LEVEL; - - // Launch our "forked" process. - BOOL bSuccess = CreateProcess ( module, // Module (exe) filename - strdup(GetCommandLine()), // Command line (exe plus parameters from the OS) - // NOTE: We cannot return the direct value of the - // GetCommandLine function here, as the pointer is - // passed straight to the child process, and will be - // invalid once we exit as it goes out of context. - // strdup() seems ok, though. - 0, // PROCESS_SECURITY_ATTRIBUTES - 0, // THREAD_SECURITY_ATTRIBUTES - TRUE, // We went to inherit handles. - startupflags, // Allow us full access to the process and suspend it. - 0, // ENVIRONMENT - 0, // CURRENT_DIRECTORY - &startupinfo, // startup info - &procinfo); // process info - - if(!bSuccess) - { - printf("CreateProcess() error: %s\n", dlerror()); - return false; - } - - // Set the owner process id in the target process. - SIZE_T written = 0; - DWORD pid = GetCurrentProcessId(); - if(!WriteProcessMemory(procinfo.hProcess, &owner_processid, &pid, sizeof(DWORD), &written) || written != sizeof(DWORD)) - { - printf("WriteProcessMemory() failed: %s\n", dlerror()); - return false; - } - - // Resume the other thread (let it start) - ResumeThread(procinfo.hThread); - - // Wait for the new process to kill us. If there is some error, the new process will end and we will end up at the next line. - WaitForSingleObject(procinfo.hProcess, INFINITE); - - // If we hit this it means startup failed, default to 14 if this fails. - DWORD ExitCode = 14; - GetExitCodeProcess(procinfo.hProcess, &ExitCode); - CloseHandle(procinfo.hThread); - CloseHandle(procinfo.hProcess); - return ExitCode; -} - -void WindowsForkKillOwner(InspIRCd * Instance) -{ - 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); - } - - // die die die - if(!TerminateProcess(hProcess, 0)) - { - printf("Could not TerminateProcess(): %s\n", dlerror()); - Instance->Exit(14); - } - - CloseHandle(hProcess); -} - -#endif +#include "caller.h" using irc::sockets::NonBlocking; using irc::sockets::Blocking; @@ -151,6 +48,7 @@ using irc::sockets::insp_inaddr; using irc::sockets::insp_sockaddr; InspIRCd* SI = NULL; +int* mysig = NULL; /* Burlex: Moved from exitcodes.h -- due to duplicate symbols */ const char* ExitCodes[] = @@ -173,51 +71,6 @@ const char* ExitCodes[] = "Received SIGTERM", /* 15 */ }; -void InspIRCd::AddServerName(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return; - - string * ns = new string(servername); - servernames.push_back(ns); -} - -const char* InspIRCd::FindServerNamePtr(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return (*itr)->c_str(); - - servernames.push_back(new string(servername)); - itr = --servernames.end(); - return (*itr)->c_str(); -} - -bool InspIRCd::FindServerName(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return true; - return false; -} - -void InspIRCd::Exit(int status) -{ -#ifdef WINDOWS - CloseIPC(); -#endif - if (SI) - { - SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); - SI->Cleanup(); - } - exit (status); -} - void InspIRCd::Cleanup() { std::vector mymodnames; @@ -295,27 +148,12 @@ void InspIRCd::Restart(const std::string &reason) } } -void InspIRCd::Rehash(int status) -{ - SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(SI->ConfigFileName)); - SI->CloseLog(); - SI->OpenLog(SI->Config->argv, SI->Config->argc); - SI->RehashUsersAndChans(); - FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect()); - SI->Config->Read(false,NULL); - SI->ResetMaxBans(); - SI->Res->Rehash(); - FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,"")); - SI->BuildISupport(); -} - void InspIRCd::ResetMaxBans() { for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++) i->second->ResetMaxBans(); } - /** Because hash_map doesnt free its buckets when we delete items (this is a 'feature') * we must occasionally rehash the hash (yes really). * We do this by copying the entries from the old hash to a new hash, causing all @@ -351,11 +189,11 @@ void InspIRCd::SetSignals() { #ifndef WIN32 signal(SIGALRM, SIG_IGN); - signal(SIGHUP, InspIRCd::Rehash); + signal(SIGHUP, InspIRCd::SetSignal); signal(SIGPIPE, SIG_IGN); signal(SIGCHLD, SIG_IGN); #endif - signal(SIGTERM, InspIRCd::Exit); + signal(SIGTERM, InspIRCd::SetSignal); } void InspIRCd::QuickExit(int status) @@ -391,7 +229,7 @@ bool InspIRCd::DaemonSeed() umask (007); printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); - signal(SIGTERM, InspIRCd::Exit); + signal(SIGTERM, InspIRCd::SetSignal); rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) @@ -437,14 +275,26 @@ void InspIRCd::WritePID(const std::string &filename) } } -std::string InspIRCd::GetRevision() -{ - return REVISION; -} - InspIRCd::InspIRCd(int argc, char** argv) - : ModCount(-1), GlobalCulls(this) + : ModCount(0), + GlobalCulls(this), + + /* Functor initialisation. Note that the ordering here is very important. */ + HandleProcessUser(this), + HandleIsNick(this), + HandleIsIdent(this), + HandleFindDescriptor(this), + HandleFloodQuitUser(this), + + /* Functor pointer initialisation. Must match the order of the list above */ + ProcessUser(&HandleProcessUser), + IsNick(&HandleIsNick), + IsIdent(&HandleIsIdent), + FindDescriptor(&HandleFindDescriptor), + FloodQuitUser(&HandleFloodQuitUser) + { + int found_ports = 0; FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ @@ -455,6 +305,8 @@ InspIRCd::InspIRCd(int argc, char** argv) memset(&server, 0, sizeof(server)); memset(&client, 0, sizeof(client)); + this->s_signal = 0; + this->unregistered_count = 0; this->clientlist = new user_hash(); @@ -465,7 +317,11 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->argv = argv; this->Config->argc = argc; - chdir(Config->GetFullProgDir().c_str()); + if (chdir(Config->GetFullProgDir().c_str())) + { + printf("Unable to change to my directory: %s\nAborted.", strerror(errno)); + exit(0); + } this->Config->opertypes.clear(); this->Config->operclass.clear(); @@ -522,7 +378,7 @@ InspIRCd::InspIRCd(int argc, char** argv) #ifdef WIN32 // Handle forking - if(!do_nofork && !owner_processid) + if(!do_nofork) { DWORD ExitCode = WindowsForkStart(this); if(ExitCode) @@ -533,6 +389,7 @@ InspIRCd::InspIRCd(int argc, char** argv) WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); + ChangeWindowsSpecificPointers(this); #endif if (!ServerConfig::FileExists(this->ConfigFileName)) { @@ -661,7 +518,7 @@ InspIRCd::InspIRCd(int argc, char** argv) } } #else - InitIPC(); + WindowsIPC = new IPC(this); if(!Config->nofork) { WindowsForkKillOwner(this); @@ -674,34 +531,6 @@ InspIRCd::InspIRCd(int argc, char** argv) this->WritePID(Config->PID); } -std::string InspIRCd::GetVersionString() -{ - char versiondata[MAXBUF]; - char dnsengine[] = "singlethread-object"; - - if (*Config->CustomVersion) - { - snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion); - } - else - { - snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine); - } - return versiondata; -} - -void InspIRCd::BuildISupport() -{ - // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... - std::stringstream v; - v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES-1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; - v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; - v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU"; - Config->data005 = v.str(); - FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005)); - Config->Update005(); -} - void InspIRCd::DoOneIteration(bool process_module_sockets) { #ifndef WIN32 @@ -749,7 +578,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) this->stats->LastCPU = ru.ru_utime; } #else - CheckIPC(this); + WindowsIPC->Check(); if(Config->nofork) { @@ -776,6 +605,13 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) /* If any inspsockets closed, remove them */ this->InspSocketCull(); + + if (this->s_signal) + { + this->SignalHandler(s_signal); + this->s_signal = 0; + } + } void InspIRCd::InspSocketCull() @@ -808,6 +644,7 @@ int InspIRCd::Run() int main(int argc, char** argv) { SI = new InspIRCd(argc, argv); + mysig = &SI->s_signal; SI->Run(); delete SI; return 0; @@ -877,88 +714,8 @@ int InspIRCd::GetTimeDelta() return time_delta; } -bool FileLogger::Readable() -{ - return false; -} - -void FileLogger::HandleEvent(EventType et, int errornum) +void InspIRCd::SetSignal(int signal) { - this->WriteLogLine(""); - if (log) - ServerInstance->SE->DelFd(this); + *mysig = signal; } - -void FileLogger::WriteLogLine(const std::string &line) -{ - if (line.length()) - buffer.append(line); - - if (log) - { - int written = fprintf(log,"%s",buffer.c_str()); -#ifdef WINDOWS - buffer.clear(); -#else - if ((written >= 0) && (written < (int)buffer.length())) - { - buffer.erase(0, buffer.length()); - ServerInstance->SE->AddFd(this); - } - else if (written == -1) - { - if (errno == EAGAIN) - ServerInstance->SE->AddFd(this); - } - else - { - /* Wrote the whole buffer, and no need for write callback */ - buffer.clear(); - } -#endif - if (writeops++ % 20) - { - fflush(log); - } - } -} - -void FileLogger::Close() -{ - if (log) - { - /* Burlex: Windows assumes nonblocking on FILE* pointers anyway, and also "file" fd's aren't the same - * as socket fd's. */ -#ifndef WIN32 - int flags = fcntl(fileno(log), F_GETFL, 0); - fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK); -#endif - if (buffer.size()) - fprintf(log,"%s",buffer.c_str()); - -#ifndef WINDOWS - ServerInstance->SE->DelFd(this); -#endif - - fflush(log); - fclose(log); - } - - buffer.clear(); -} - -FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0) -{ - if (log) - { - irc::sockets::NonBlocking(fileno(log)); - this->SetFd(fileno(log)); - buffer.clear(); - } -} - -FileLogger::~FileLogger() -{ - this->Close(); -} - +