X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finspircd.cpp;h=de725d0e1601f14bfafd5325a3e4edebab1d69e5;hb=a36fa98300016380378100260a58b2f297a08f72;hp=6a32e2fc1925ba8dcd3c50ed8fd291a88403ad51;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 6a32e2fc1..de725d0e1 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -38,6 +38,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 +48,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 +85,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 +94,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++) { @@ -103,9 +108,7 @@ void InspIRCd::Cleanup() } /* Close logging */ - if (this->Logger) - this->Logger->Close(); - + this->Logs->CloseLogs(); /* Cleanup Server Names */ for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) @@ -156,21 +159,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 +183,6 @@ void InspIRCd::RehashUsersAndChans() delete old_chans; } -void InspIRCd::CloseLog() -{ - if (this->Logger) - this->Logger->Close(); -} - void InspIRCd::SetSignals() { #ifndef WIN32 @@ -235,14 +232,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; @@ -271,7 +268,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); } } @@ -297,22 +294,34 @@ InspIRCd::InspIRCd(int argc, char** argv) 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; 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; - this->unregistered_count = 0; + ThreadEngineFactory* tef = new ThreadEngineFactory(); + this->Threads = tef->Create(this); + delete tef; - this->clientlist = new user_hash(); - this->uuidlist = new user_hash(); + this->s_signal = 0; + + // Create base manager classes early, so nothing breaks + this->Users = new UserManager(this); + + this->Users->unregistered_count = 0; + + this->Users->clientlist = new user_hash(); + this->Users->uuidlist = new user_hash(); this->chanlist = new chan_hash(); this->Res = NULL; @@ -339,7 +348,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; @@ -354,6 +362,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 } }; @@ -374,12 +383,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); @@ -403,6 +416,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)); @@ -412,27 +431,25 @@ 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 - */ + * 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); @@ -458,59 +475,59 @@ 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) - { + 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) + { } - else - { + else + { // 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(); + 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); + /* set up fake client again this time with the correct uid */ + delete FakeClient; + this->FakeClient = new User(this); + this->FakeClient->SetFd(FD_MAGIC_NUMBER); - // Get XLine to do it's thing. - this->XLines->CheckELines(); - this->XLines->ApplyLines(); + // Get XLine to do it's thing. + this->XLines->CheckELines(); + this->XLines->ApplyLines(); CheckDie(); @@ -518,18 +535,18 @@ InspIRCd::InspIRCd(int argc, char** argv) 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) { @@ -547,7 +564,7 @@ InspIRCd::InspIRCd(int argc, char** argv) 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)); } } @@ -565,7 +582,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 @@ -577,8 +594,8 @@ InspIRCd::InspIRCd(int argc, char** argv) } #endif - printf("\nInspIRCd is now running!\n"); - Log(DEFAULT,"Startup complete."); + printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->GetSID().c_str()); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str()); this->WritePID(Config->PID); } @@ -601,6 +618,14 @@ void InspIRCd::InitialiseUID() 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 @@ -611,6 +636,20 @@ int InspIRCd::Run() static char window_title[100]; #endif + if (this->ConfigThread && this->ConfigThread->GetExitFlag()) + { + /* Rehash has completed */ + this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up..."); + delete ConfigThread; + 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. */ @@ -626,7 +665,7 @@ int InspIRCd::Run() { if (TIME < OLDTIME) { - WriteOpers("*** \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 %d secs.",abs(OLDTIME-TIME)); } if ((TIME % 3600) == 0) @@ -641,7 +680,6 @@ int InspIRCd::Run() if ((TIME % 5) == 0) { FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - Timers->TickMissedTimers(TIME); SNO->FlushSnotices(); } #ifndef WIN32 @@ -652,16 +690,7 @@ int InspIRCd::Run() this->stats->LastCPU = ru.ru_utime; } #else - WindowsIPC->Check(); - - if(Config->nofork) - { - uptime = Time() - startup_time; - stime = gmtime(&uptime); - snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u", - LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec); - SetConsoleTitle(window_title); - } + WindowsIPC->Check(); #endif } @@ -674,7 +703,7 @@ int InspIRCd::Run() */ this->SE->DispatchEvents(); - /* if any users was quit, take them out */ + /* if any users were quit, take them out */ this->GlobalCulls.Apply(); /* If any inspsockets closed, remove them */ @@ -694,7 +723,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; @@ -733,44 +762,11 @@ bool InspIRCd::AllModulesReportReady(User* user) 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; -} - -void InspIRCd::AddLocalClone(User* user) -{ - clonemap::iterator x = local_clones.find(user->GetIPString()); - if (x != local_clones.end()) - x->second++; - else - local_clones[user->GetIPString()] = 1; -} - -void InspIRCd::AddGlobalClone(User* user) -{ - clonemap::iterator y = global_clones.find(user->GetIPString()); - if (y != global_clones.end()) - y->second++; - else - global_clones[user->GetIPString()] = 1; -} - -int InspIRCd::GetTimeDelta() -{ - return time_delta; -} - void InspIRCd::SetSignal(int signal) { *mysig = signal;