X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=ab499f1d1a66a1d13d385563b3c481ad9cb945f8;hb=e078fae142238765f279b50c309f22a5a0761ce4;hp=915c7ae94b7d3775a3e8a4f8e393e24ed4034060;hpb=2eb1793dbdd203adfbdaa3eca37221ff5d3c317c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 915c7ae94..ab499f1d1 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -12,7 +12,6 @@ */ /* $Install: src/inspircd $(BINPATH) */ - #include "inspircd.h" #include @@ -27,6 +26,13 @@ #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #endif + + /* CRT memory debugging */ + #ifdef DEBUG + #define _CRTDBG_MAP_ALLOC + #include + #include + #endif #endif #include @@ -38,6 +44,7 @@ #include "command_parse.h" #include "exitcodes.h" #include "caller.h" +#include "testsuite.h" using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; @@ -47,7 +54,9 @@ InspIRCd* SI = NULL; int* mysig = NULL; -/* Burlex: Moved from exitcodes.h -- due to duplicate symbols */ +/* Moved from exitcodes.h -- due to duplicate symbols -- Burlex + * XXX this is a bit ugly. -- w00t + */ const char* ExitCodes[] = { "No error", /* 0 */ @@ -82,7 +91,7 @@ void InspIRCd::Cleanup() } /* Close all client sockets, or the new process inherits them */ - for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) + for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) { (*i)->SetWriteError("Server shutdown"); (*i)->CloseSocket(); @@ -91,6 +100,8 @@ void InspIRCd::Cleanup() /* We do this more than once, so that any service providers get a * chance to be unhooked by the modules using them, but then get * a chance to be removed themsleves. + * + * XXX there may be a better way to do this with 1.2 */ for (int tries = 0; tries < 3; tries++) { @@ -101,17 +112,109 @@ void InspIRCd::Cleanup() this->Modules->Unload(k->c_str()); } } - - /* Close logging */ - if (this->Logger) - this->Logger->Close(); - + /* Remove core commands */ + Parser->RemoveCommands(""); /* Cleanup Server Names */ for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) delete (*itr); + /* Delete objects dynamically allocated in constructor + * (destructor would be more appropriate, but we're likely exiting) + */ + + // Must be deleted before modes as it decrements modelines + if (this->Users) + { + delete this->Users; + this->Users = 0; + } + + if (this->Modes) + { + delete this->Modes; + this->Modes = 0; + } + + if (this->XLines) + { + delete this->XLines; + this->XLines = 0; + } + + if (this->Parser) + { + delete this->Parser; + this->Parser = 0; + + if (this->stats) + { + delete this->stats; + this->stats = 0; + } + + if (this->Modules) + { + delete this->Modules; + this->Modules = 0; + } + + if (this->BanCache) + delete this->BanCache; + this->BanCache = 0; + } + + if (this->SNO) + { + delete this->SNO; + this->SNO = 0; + } + + if (this->Config) + { + delete this->Config; + this->Config = 0; + } + + if (this->Res) + { + delete this->Res; + this->Res = 0; + } + if (this->chanlist) + { + delete chanlist; + chanlist = 0; + } + + if (this->PI) + { + delete this->PI; + this->PI = 0; + } + + if (this->Threads) + { + delete this->Threads; + this->Threads = 0; + } + + /* Needs to be deleted after Res, DNS has a timer */ + if (this->Timers) + { + delete this->Timers; + this->Timers = 0; + } + + /* Close logging */ + this->Logs->CloseLogs(); + + if (this->Logs) + { + delete this->Logs; + this->Logs = 0; + } } void InspIRCd::Restart(const std::string &reason) @@ -121,8 +224,6 @@ void InspIRCd::Restart(const std::string &reason) */ this->SendError(reason); - this->Cleanup(); - /* Figure out our filename (if theyve renamed it, we're boned) */ std::string me; @@ -134,7 +235,11 @@ void InspIRCd::Restart(const std::string &reason) me = Config->MyDir + "/inspircd"; #endif - if (execv(me.c_str(), Config->argv) == -1) + char** argv = Config->argv; + + this->Cleanup(); + + if (execv(me.c_str(), argv) == -1) { /* Will raise a SIGABRT if not trapped */ throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno)); @@ -156,21 +261,21 @@ void InspIRCd::ResetMaxBans() */ void InspIRCd::RehashUsersAndChans() { - user_hash* old_users = this->clientlist; - user_hash* old_uuid = this->uuidlist; + user_hash* old_users = this->Users->clientlist; + user_hash* old_uuid = this->Users->uuidlist; chan_hash* old_chans = this->chanlist; - this->clientlist = new user_hash(); - this->uuidlist = new user_hash(); + this->Users->clientlist = new user_hash(); + this->Users->uuidlist = new user_hash(); this->chanlist = new chan_hash(); for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) - this->clientlist->insert(*n); + this->Users->clientlist->insert(*n); delete old_users; for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++) - this->uuidlist->insert(*n); + this->Users->uuidlist->insert(*n); delete old_uuid; @@ -180,12 +285,6 @@ void InspIRCd::RehashUsersAndChans() delete old_chans; } -void InspIRCd::CloseLog() -{ - if (this->Logger) - this->Logger->Close(); -} - void InspIRCd::SetSignals() { #ifndef WIN32 @@ -235,14 +334,14 @@ bool InspIRCd::DaemonSeed() rlimit rl; if (getrlimit(RLIMIT_CORE, &rl) == -1) { - this->Log(DEFAULT,"Failed to getrlimit()!"); + this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!"); return false; } else { rl.rlim_cur = rl.rlim_max; if (setrlimit(RLIMIT_CORE, &rl) == -1) - this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); + this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size."); } return true; @@ -252,7 +351,8 @@ bool InspIRCd::DaemonSeed() void InspIRCd::WritePID(const std::string &filename) { std::string fname = (filename.empty() ? "inspircd.pid" : filename); - if (*(fname.begin()) != '/') + std::replace(fname.begin(), fname.end(), '\\', '/'); + if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename))) { std::string::size_type pos; std::string confpath = this->ConfigFileName; @@ -271,7 +371,7 @@ void InspIRCd::WritePID(const std::string &filename) else { printf("Failed to write PID-file '%s', exiting.\n",fname.c_str()); - this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str()); + this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str()); Exit(EXIT_STATUS_PID); } } @@ -279,43 +379,93 @@ void InspIRCd::WritePID(const std::string &filename) InspIRCd::InspIRCd(int argc, char** argv) : GlobalCulls(this), - /* Functor initialisation. Note that the ordering here is very important. */ + /* Functor initialisation. Note that the ordering here is very important. + * + * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes + * within class InspIRCd. + */ HandleProcessUser(this), HandleIsNick(this), HandleIsIdent(this), HandleFindDescriptor(this), HandleFloodQuitUser(this), - - /* Functor pointer initialisation. Must match the order of the list above */ + HandleIsChannel(this), + HandleIsSID(this), + HandleRehash(this), + + /* Functor pointer initialisation. Must match the order of the list above + * + * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods + * themselves within the class. + */ ProcessUser(&HandleProcessUser), + IsChannel(&HandleIsChannel), + IsSID(&HandleIsSID), + Rehash(&HandleRehash), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), FindDescriptor(&HandleFindDescriptor), FloodQuitUser(&HandleFloodQuitUser) { - +#ifdef WIN32 + // Strict, frequent checking of memory on debug builds + _CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); + + // Avoid erroneous frees on early exit + WindowsIPC = 0; +#endif int found_ports = 0; FailedPortList pl; - int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ + int do_version = 0, do_nofork = 0, do_debug = 0, + do_nolog = 0, do_root = 0, do_testsuite = 0; /* flag variables */ char c = 0; + // Initialize so that if we exit before proper initialization they're not deleted + this->Logs = 0; + this->Threads = 0; + this->PI = 0; + this->Users = 0; + this->chanlist = 0; + this->Config = 0; + this->SNO = 0; + this->BanCache = 0; + this->Modules = 0; + this->stats = 0; + this->Timers = 0; + this->Parser = 0; + this->XLines = 0; + this->Modes = 0; + this->Res = 0; + + memset(&server, 0, sizeof(server)); memset(&client, 0, sizeof(client)); + // This must be created first, so other parts of Insp can use it while starting up + this->Logs = new LogManager(this); + SocketEngineFactory* SEF = new SocketEngineFactory(); SE = SEF->Create(this); delete SEF; - this->s_signal = 0; + ThreadEngineFactory* tef = new ThreadEngineFactory(); + this->Threads = tef->Create(this); + delete tef; - this->unregistered_count = 0; + /* Default implementation does nothing */ + this->PI = new ProtocolInterface(this); - this->clientlist = new user_hash(); - this->uuidlist = new user_hash(); - this->chanlist = new chan_hash(); + this->s_signal = 0; + + // Create base manager classes early, so nothing breaks + this->Users = new UserManager(this); + + this->Users->unregistered_count = 0; - this->Res = NULL; + this->Users->clientlist = new user_hash(); + this->Users->uuidlist = new user_hash(); + this->chanlist = new chan_hash(); this->Config = new ServerConfig(this); this->SNO = new SnomaskManager(this); @@ -325,7 +475,6 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Timers = new TimerManager(this); this->Parser = new CommandParser(this); this->XLines = new XLineManager(this); - this->Users = new UserManager(this); this->Config->argv = argv; this->Config->argc = argc; @@ -340,7 +489,6 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->operclass.clear(); this->TIME = this->OLDTIME = this->startup_time = time(NULL); - this->time_delta = 0; srand(this->TIME); *this->LogFileName = 0; @@ -355,6 +503,7 @@ InspIRCd::InspIRCd(int argc, char** argv) { "nolog", no_argument, &do_nolog, 1 }, { "runasroot", no_argument, &do_root, 1 }, { "version", no_argument, &do_version, 1 }, + { "testsuite", no_argument, &do_testsuite, 1 }, { 0, 0, 0, 0 } }; @@ -375,12 +524,16 @@ InspIRCd::InspIRCd(int argc, char** argv) break; default: /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */ - printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ] [--runasroot] [--version] [--config ]\n", argv[0]); + printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ]\n\ + [--runasroot] [--version] [--config ] [--testsuite]\n", argv[0]); Exit(EXIT_STATUS_ARGV); break; } } + if (do_testsuite) + do_nofork = do_debug = true; + if (do_version) { printf("\n%s r%s\n", VERSION, REVISION); @@ -404,6 +557,12 @@ InspIRCd::InspIRCd(int argc, char** argv) #endif strlcpy(Config->MyExecutable,argv[0],MAXBUF); + /* Set the finished argument values */ + Config->nofork = do_nofork; + Config->forcedebug = do_debug; + Config->writelog = !do_nolog; + Config->TestSuite = do_testsuite; + if (!this->OpenLog(argv, argc)) { printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); @@ -413,30 +572,21 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!ServerConfig::FileExists(this->ConfigFileName)) { printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); - this->Log(DEFAULT,"Unable to open config file %s", this->ConfigFileName); + this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName); Exit(EXIT_STATUS_CONFIG); } printf_c("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); printf_c("(C) InspIRCd Development Team.\033[0m\n\n"); - printf_c("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey, Burlex\033[0m\n"); + printf_c("Developers:\n"); + printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n"); + printf_c("\t\033[1;32mpippijn, peavey, aquanight, fez\033[0m\n\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); - /* Set the finished argument values */ - Config->nofork = do_nofork; - Config->forcedebug = do_debug; - Config->writelog = !do_nolog; Config->ClearStack(); this->Modes = new ModeParser(this); - /* set up fake client (uid is incorrect at this point, - * until after config is read. we set up the user again - * at that point - */ - this->FakeClient = new User(this); - this->FakeClient->SetFd(FD_MAGIC_NUMBER); - if (!do_root) this->CheckRoot(); else @@ -459,96 +609,94 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!this->DaemonSeed()) { printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Log(DEFAULT,"ERROR: could not go into daemon mode. Shutting down."); + Logs->Log("STARTUP", DEFAULT, "ERROR: could not go into daemon mode. Shutting down."); Exit(EXIT_STATUS_FORK); } } SE->RecoverFromFork(); - /* Read config, pass 0. At the end if this pass, - * the Config->IncludeFiles is populated, we call - * Config->StartDownloads to initialize the downlaods of all - * these files. + /* During startup we don't actually initialize this + * in the thread engine. */ - Config->Read(true, NULL, 0); - Config->DoDownloads(); - /* We have all the files we can get, initiate pass 1 */ - Config->Read(true, NULL, 1); - - this->AddServerName(Config->ServerName); - - /* - * Initialise SID/UID. - * For an explanation as to exactly how this works, and why it works this way, see GetUID(). - * -- w00t - */ - if (*Config->sid) - { - } - else - { + this->ConfigThread = new ConfigReaderThread(this, true, NULL); + ConfigThread->Run(); + delete ConfigThread; + this->ConfigThread = NULL; + + this->Res = new DNS(this); + + this->AddServerName(Config->ServerName); + + /* + * Initialise SID/UID. + * For an explanation as to exactly how this works, and why it works this way, see GetUID(). + * -- w00t + */ + if (!*Config->sid) + { // Generate one size_t sid = 0; - for (const char* x = Config->ServerName; *x; ++x) - sid = 5 * sid + *x; - for (const char* y = Config->ServerDesc; *y; ++y) - sid = 5 * sid + *y; - sid = sid % 999; + for (const char* x = Config->ServerName; *x; ++x) + sid = 5 * sid + *x; + for (const char* y = Config->ServerDesc; *y; ++y) + sid = 5 * sid + *y; + sid = sid % 999; Config->sid[0] = (char)(sid / 100 + 48); Config->sid[1] = (char)(((sid / 10) % 10) + 48); Config->sid[2] = (char)(sid % 10 + 48); - } - - this->InitialiseUID(); - - /* set up fake client again this time with the correct uid */ - delete FakeClient; - this->FakeClient = new User(this); - this->FakeClient->SetFd(FD_MAGIC_NUMBER); + Config->sid[3] = '\0'; + } - // Get XLine to do it's thing. - this->XLines->CheckELines(); - this->XLines->ApplyLines(); + /* set up fake client again this time with the correct uid */ + this->FakeClient = new User(this, "#INVALID"); + this->FakeClient->SetFd(FD_MAGIC_NUMBER); + // Get XLine to do it's thing. + this->XLines->CheckELines(); + this->XLines->ApplyLines(); CheckDie(); int bounditems = BindPorts(true, found_ports, pl); printf("\n"); - /*this->Modules->LoadAll();*/ + this->Modules->LoadAll(); /* Just in case no modules were loaded - fix for bug #101 */ this->BuildISupport(); InitializeDisabledCommands(Config->DisabledCommands, this); - if ((Config->ports.size() == 0) && (found_ports > 0)) + /*if ((Config->ports.size() == 0) && (found_ports > 0)) { printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); - Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?"); + Logs->Log("STARTUP", DEFAULT,"ERROR: I couldn't bind any ports! Something else is bound to those ports!"); Exit(EXIT_STATUS_BIND); - } + }*/ if (Config->ports.size() != (unsigned int)found_ports) { printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports); printf("The following port(s) failed to bind:\n"); + printf("Hint: Try using a public IP instead of blank or *\n\n"); int j = 1; for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) { printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "" : i->first.c_str(), (unsigned long)i->second); } } + + printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + #ifndef WINDOWS if (!Config->nofork) { if (kill(getppid(), SIGTERM) == -1) { printf("Error killing parent process: %s\n",strerror(errno)); - Log(DEFAULT,"Error killing parent process: %s",strerror(errno)); + Logs->Log("STARTUP", DEFAULT, "Error killing parent process: %s",strerror(errno)); } } @@ -558,7 +706,7 @@ InspIRCd::InspIRCd(int argc, char** argv) * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont * close stdin/stdout */ - if (!do_nofork) + if ((!do_nofork) && (!do_testsuite)) { fclose(stdin); fclose(stderr); @@ -566,7 +714,7 @@ InspIRCd::InspIRCd(int argc, char** argv) } else { - Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground."); + Logs->Log("STARTUP", DEFAULT,"Keeping pseudo-tty open as we are running in the foreground."); } } #else @@ -578,30 +726,21 @@ InspIRCd::InspIRCd(int argc, char** argv) } #endif - printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->SID); - Log(DEFAULT,"Startup complete as '%s'[%s]", Config->ServerName,Config->SID); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); this->WritePID(Config->PID); } -/* moved to a function, as UID generation can call this also */ -void InspIRCd::InitialiseUID() -{ - int i = 3; - - current_uid[0] = Config->sid[0]; - current_uid[1] = Config->sid[1]; - current_uid[2] = Config->sid[2]; - - /* Initialise UID */ - for(i = 3; i < UUID_LENGTH - 1; i++) - current_uid[i] = 'A'; - - current_uid[UUID_LENGTH] = '\0'; -} - int InspIRCd::Run() { + /* See if we're supposed to be running the test suite rather than entering the mainloop */ + if (Config->TestSuite) + { + TestSuite* ts = new TestSuite(this); + delete ts; + Exit(0); + } + while (true) { #ifndef WIN32 @@ -612,6 +751,35 @@ int InspIRCd::Run() static char window_title[100]; #endif + /* Check if there is a config thread which has finished executing but has not yet been freed */ + if (this->ConfigThread && this->ConfigThread->GetExitFlag()) + { + /* Rehash has completed */ + this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up..."); + + /* IMPORTANT: This delete may hang if you fuck up your thread syncronization. + * It will hang waiting for the ConfigThread to 'join' to avoid race conditons, + * until the other thread is completed. + */ + delete ConfigThread; + ConfigThread = NULL; + + /* These are currently not known to be threadsafe, so they are executed outside + * of the thread. It would be pretty simple to move them to the thread Run method + * once they are known threadsafe with all the correct mutexes in place. + * + * XXX: The order of these is IMPORTANT, do not reorder them without testing + * thoroughly!!! + */ + this->XLines->CheckELines(); + this->XLines->ApplyLines(); + this->Res->Rehash(); + this->ResetMaxBans(); + InitializeDisabledCommands(Config->DisabledCommands, this); + FOREACH_MOD_I(this, I_OnRehash, OnRehash(Config->RehashUser, Config->RehashParameter)); + this->BuildISupport(); + } + /* time() seems to be a pretty expensive syscall, so avoid calling it too much. * Once per loop iteration is pleanty. */ @@ -627,7 +795,7 @@ int InspIRCd::Run() { if (TIME < OLDTIME) { - SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); + SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME); } if ((TIME % 3600) == 0) @@ -685,7 +853,7 @@ void InspIRCd::BufferedSocketCull() { for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) { - Log(DEBUG,"Cull socket"); + this->Logs->Log("MISC",DEBUG,"Cull socket"); SE->DelFd(x->second); x->second->Close(); delete x->second; @@ -716,34 +884,17 @@ bool InspIRCd::AllModulesReportReady(User* user) { for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i) { - int res = (*i)->OnCheckReady(user); - if (!res) + if (!(*i)->OnCheckReady(user)) return false; } - return true; } -time_t InspIRCd::Time(bool delta) +time_t InspIRCd::Time() { - if (delta) - return TIME + time_delta; return TIME; } -int InspIRCd::SetTimeDelta(int delta) -{ - int old = time_delta; - time_delta = delta; - this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old); - return old; -} - -int InspIRCd::GetTimeDelta() -{ - return time_delta; -} - void InspIRCd::SetSignal(int signal) { *mysig = signal;