X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=fe0ac0a1170842e1c4c9fd4f6195942b52170d4d;hb=9d4004e8d477232c143830508a7a6e41fd2d31b7;hp=704fec475b40a4d2560cdb3ec4180ef1cd99e4d4;hpb=e2af2347fc035d702e45f12e772223a8d578410d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 704fec475..fe0ac0a11 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -36,7 +36,6 @@ #include "xline.h" #include "bancache.h" #include "socketengine.h" -#include "inspircd_se_config.h" #include "socket.h" #include "command_parse.h" #include "exitcodes.h" @@ -84,56 +83,38 @@ const char* ExitCodes[] = template static void DeleteZero(T*&n) { - if (n != NULL) - { - delete n; - n = NULL; - } + T* t = n; + n = NULL; + delete t; } void InspIRCd::Cleanup() { - if (Config) + for (unsigned int i = 0; i < ports.size(); i++) { - for (unsigned int i = 0; i < ports.size(); i++) - { - /* This calls the constructor and closes the listening socket */ - delete ports[i]; - } - - ports.clear(); + /* This calls the constructor and closes the listening socket */ + ports[i]->cull(); + delete ports[i]; } + ports.clear(); /* Close all client sockets, or the new process inherits them */ - std::vector::reverse_iterator i = Users->local_users.rbegin(); + std::vector::reverse_iterator i = Users->local_users.rbegin(); while (i != this->Users->local_users.rend()) { User* u = *i++; Users->QuitUser(u, "Server shutdown"); } - /* 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 < 4; tries++) - { - std::vector module_names = Modules->GetAllModuleNames(0); - for (std::vector::iterator k = module_names.begin(); k != module_names.end(); ++k) - { - /* Unload all modules, so they get a chance to clean up their listeners */ - this->Modules->Unload(k->c_str()); - } - } - - /* Cleanup Server Names */ - for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) - delete (*itr); + GlobalCulls.Apply(); + Modules->UnloadAll(); /* 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 (FakeClient) + FakeClient->cull(); + if (Res) + Res->cull(); DeleteZero(this->FakeClient); DeleteZero(this->Users); DeleteZero(this->Modes); @@ -165,16 +146,16 @@ void InspIRCd::Restart(const std::string &reason) /* Figure out our filename (if theyve renamed it, we're boned) */ std::string me; + char** argv = Config->cmdline.argv; + #ifdef WINDOWS char module[MAX_PATH]; if (GetModuleFileName(NULL, module, MAX_PATH)) me = module; #else - me = Config->MyDir + "/inspircd"; + me = argv[0]; #endif - char** argv = Config->argv; - this->Cleanup(); if (execv(me.c_str(), argv) == -1) @@ -266,7 +247,6 @@ bool InspIRCd::DaemonSeed() exit(0); } setsid (); - umask (007); printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); signal(SIGTERM, InspIRCd::SetSignal); @@ -277,12 +257,10 @@ bool InspIRCd::DaemonSeed() this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!"); return false; } - else - { - rl.rlim_cur = rl.rlim_max; - if (setrlimit(RLIMIT_CORE, &rl) == -1) + rl.rlim_cur = rl.rlim_max; + + if (setrlimit(RLIMIT_CORE, &rl) == -1) this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size."); - } return true; #endif @@ -290,18 +268,9 @@ bool InspIRCd::DaemonSeed() void InspIRCd::WritePID(const std::string &filename) { - std::string fname = (filename.empty() ? "inspircd.pid" : filename); - std::replace(fname.begin(), fname.end(), '\\', '/'); - if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename))) - { - std::string::size_type pos; - std::string confpath = this->ConfigFileName; - if ((pos = confpath.rfind("/")) != std::string::npos) - { - /* Leaves us with just the path */ - fname = confpath.substr(0, pos) + std::string("/") + fname; - } - } + std::string fname(filename); + if (fname.empty()) + fname = "data/inspircd.pid"; std::ofstream outfile(fname.c_str()); if (outfile.is_open()) { @@ -317,30 +286,21 @@ void InspIRCd::WritePID(const std::string &filename) } InspIRCd::InspIRCd(int argc, char** argv) : - /* Functor initialisation. Note that the ordering here is very important. - * - * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes - * within class InspIRCd. - */ - HandleIsNick(this), - HandleIsIdent(this), - HandleFloodQuitUser(this), - HandleIsChannel(this), - HandleIsSID(this), - HandleRehash(this), - - /* Functor pointer initialisation. Must match the order of the list above + ConfigFileName("conf/inspircd.conf"), + + /* Functor pointer initialisation. * * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods * themselves within the class. */ + NICKForced("NICKForced", NULL), + OperQuit("OperQuit", NULL), IsChannel(&HandleIsChannel), IsSID(&HandleIsSID), Rehash(&HandleRehash), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), FloodQuitUser(&HandleFloodQuitUser) - { #ifdef WIN32 // Strict, frequent checking of memory on debug builds @@ -352,8 +312,8 @@ InspIRCd::InspIRCd(int argc, char** argv) : ServerInstance = this; - Extensible::Register(&User::NICKForced); - Extensible::Register(&User::OperQuit); + Extensions.Register(&NICKForced); + Extensions.Register(&OperQuit); FailedPortList pl; int do_version = 0, do_nofork = 0, do_debug = 0, @@ -379,23 +339,23 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->ConfigThread = NULL; // Initialise TIME - this->TIME = time(NULL); + clock_gettime(CLOCK_REALTIME, &TIME); + this->startup_time = TIME.tv_sec; // This must be created first, so other parts of Insp can use it while starting up - this->Logs = new LogManager(this); + this->Logs = new LogManager; - SocketEngineFactory SEF; - SE = SEF.Create(); + SE = CreateSocketEngine(); - this->Threads = new ThreadEngine(this); + this->Threads = new ThreadEngine; /* Default implementation does nothing */ - this->PI = new ProtocolInterface(this); + this->PI = new ProtocolInterface; this->s_signal = 0; // Create base manager classes early, so nothing breaks - this->Users = new UserManager(this); + this->Users = new UserManager; this->Users->unregistered_count = 0; @@ -403,32 +363,19 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->Users->uuidlist = new user_hash(); this->chanlist = new chan_hash(); - this->Config = new ServerConfig(this); - this->SNO = new SnomaskManager(this); - this->BanCache = new BanCacheManager(this); + this->Config = new ServerConfig; + this->SNO = new SnomaskManager; + this->BanCache = new BanCacheManager; this->Modules = new ModuleManager(); this->stats = new serverstats(); - this->Timers = new TimerManager(this); - this->Parser = new CommandParser(this); - this->XLines = new XLineManager(this); + this->Timers = new TimerManager; + this->Parser = new CommandParser; + this->XLines = new XLineManager; - this->Config->argv = argv; - this->Config->argc = argc; + this->Config->cmdline.argv = argv; + this->Config->cmdline.argc = argc; - 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(); - - this->TIME = this->OLDTIME = this->startup_time = time(NULL); - srand(this->TIME); - - *this->LogFileName = 0; - strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF); + srand(TIME.tv_nsec ^ TIME.tv_sec); struct option longopts[] = { @@ -450,11 +397,11 @@ InspIRCd::InspIRCd(int argc, char** argv) : { case 'f': /* Log filename was set */ - strlcpy(LogFileName, optarg, MAXBUF); + Config->cmdline.startup_log = optarg; break; case 'c': /* Config filename was set */ - strlcpy(ConfigFileName, optarg, MAXBUF); + ConfigFileName = optarg; break; case 0: /* getopt_long_only() set an int variable, just keep going */ @@ -484,7 +431,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : // Handle forking if(!do_nofork) { - DWORD ExitCode = WindowsForkStart(this); + DWORD ExitCode = WindowsForkStart(); if(ExitCode) exit(ExitCode); } @@ -492,23 +439,28 @@ InspIRCd::InspIRCd(int argc, char** argv) : // Set up winsock WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); - ChangeWindowsSpecificPointers(this); + ChangeWindowsSpecificPointers(); #endif - Config->MyExecutable = argv[0]; /* Set the finished argument values */ - Config->nofork = do_nofork; - Config->forcedebug = do_debug; - Config->writelog = !do_nolog; - Config->TestSuite = do_testsuite; + Config->cmdline.nofork = do_nofork; + Config->cmdline.forcedebug = do_debug; + Config->cmdline.writelog = !do_nolog; + Config->cmdline.TestSuite = do_testsuite; - if (!this->OpenLog(argv, argc)) + if (do_debug) { - printf("ERROR: Could not open logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno)); + FileWriter* fw = new FileWriter(stdout); + FileLogStream* fls = new FileLogStream(DEBUG, fw); + Logs->AddLogTypes("*", fls, true); + } + else if (!this->OpenLog(argv, argc)) + { + printf("ERROR: Could not open initial logfile %s: %s\n\n", Config->cmdline.startup_log.c_str(), strerror(errno)); Exit(EXIT_STATUS_LOG); } - if (!ServerConfig::FileExists(this->ConfigFileName)) + if (!ServerConfig::FileExists(ConfigFileName.c_str())) { #ifdef WIN32 /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */ @@ -517,13 +469,13 @@ InspIRCd::InspIRCd(int argc, char** argv) : if (ServerConfig::FileExists(txtconf.c_str())) { - strlcat(this->ConfigFileName, ".txt", MAXBUF); + ConfigFileName = txtconf; } else #endif { - printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); - this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", this->ConfigFileName); + printf("ERROR: Cannot open config file: %s\nExiting...\n", ConfigFileName.c_str()); + this->Logs->Log("STARTUP",DEFAULT,"Unable to open config file %s", ConfigFileName.c_str()); Exit(EXIT_STATUS_CONFIG); } } @@ -535,7 +487,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : printf_c("\t\033[1;32mpeavey, aquanight, psychon, dz, danieldg\033[0m\n\n"); printf_c("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); - this->Modes = new ModeParser(this); + this->Modes = new ModeParser; if (!do_root) this->CheckRoot(); @@ -554,7 +506,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->SetSignals(); - if (!Config->nofork) + if (!Config->cmdline.nofork) { if (!this->DaemonSeed()) { @@ -573,35 +525,30 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->Config->Apply(NULL, ""); Logs->OpenFileLogs(); - this->Res = new DNS(this); - - this->AddServerName(Config->ServerName); + this->Res = new DNS(); /* * Initialise SID/UID. * For an explanation as to exactly how this works, and why it works this way, see GetUID(). * -- w00t */ - if (!*Config->sid) + if (Config->sid.empty()) { // Generate one - size_t sid = 0; + unsigned int sid = 0; + char sidstr[4]; - for (const char* x = Config->ServerName; *x; ++x) + for (const char* x = Config->ServerName.c_str(); *x; ++x) sid = 5 * sid + *x; - for (const char* y = Config->ServerDesc; *y; ++y) + for (const char* y = Config->ServerDesc.c_str(); *y; ++y) sid = 5 * sid + *y; - sid = sid % 999; + sprintf(sidstr, "%03d", sid % 1000); - Config->sid[0] = (char)(sid / 100 + 48); - Config->sid[1] = (char)(((sid / 10) % 10) + 48); - Config->sid[2] = (char)(sid % 10 + 48); - Config->sid[3] = '\0'; + Config->sid = sidstr; } /* set up fake client again this time with the correct uid */ - this->FakeClient = new FakeUser(this, "!"); - this->FakeClient->SetFakeServer(Config->ServerName); + this->FakeClient = new FakeUser(Config->sid, Config->ServerName); // Get XLine to do it's thing. this->XLines->CheckELines(); @@ -630,10 +577,11 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } - printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", + Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds()); #ifndef WINDOWS - if (!Config->nofork) + if (!Config->cmdline.nofork) { if (kill(getppid(), SIGTERM) == -1) { @@ -652,7 +600,8 @@ InspIRCd::InspIRCd(int argc, char** argv) : { fclose(stdin); fclose(stderr); - fclose(stdout); + if (!Config->cmdline.forcedebug) + fclose(stdout); } else { @@ -660,20 +609,22 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } #else - WindowsIPC = new IPC(this); + WindowsIPC = new IPC; if(!Config->nofork) { - WindowsForkKillOwner(this); + WindowsForkKillOwner(); FreeConsole(); } /* Set win32 service as running, if we are running as a service */ SetServiceRunning(); #endif - Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SE->GetMaxFds()); #ifndef WIN32 - if (*(this->Config->SetGroup)) + std::string SetUser = Config->ConfValue("security")->getString("runasuser"); + std::string SetGroup = Config->ConfValue("security")->getString("runasgroup"); + if (!SetGroup.empty()) { int ret; @@ -690,7 +641,7 @@ InspIRCd::InspIRCd(int argc, char** argv) : struct group *g; errno = 0; - g = getgrnam(this->Config->SetGroup); + g = getgrnam(SetGroup.c_str()); if (!g) { @@ -707,13 +658,13 @@ InspIRCd::InspIRCd(int argc, char** argv) : } } - if (*(this->Config->SetUser)) + if (!SetUser.empty()) { // setuid struct passwd *u; errno = 0; - u = getpwnam(this->Config->SetUser); + u = getpwnam(SetUser.c_str()); if (!u) { @@ -734,16 +685,24 @@ InspIRCd::InspIRCd(int argc, char** argv) : this->WritePID(Config->PID); } +void InspIRCd::UpdateTime() +{ + clock_gettime(CLOCK_REALTIME, &TIME); +} + int InspIRCd::Run() { /* See if we're supposed to be running the test suite rather than entering the mainloop */ - if (Config->TestSuite) + if (Config->cmdline.TestSuite) { - TestSuite* ts = new TestSuite(this); + TestSuite* ts = new TestSuite; delete ts; Exit(0); } + UpdateTime(); + time_t OLDTIME = TIME.tv_sec; + while (true) { #ifndef WIN32 @@ -767,53 +726,48 @@ int InspIRCd::Run() ConfigThread = NULL; } - /* time() seems to be a pretty expensive syscall, so avoid calling it too much. - * Once per loop iteration is pleanty. - */ - OLDTIME = TIME; - TIME = time(NULL); + UpdateTime(); /* Run background module timers every few seconds * (the docs say modules shouldnt rely on accurate * timing using this event, so we dont have to * time this exactly). */ - if (TIME != OLDTIME) + if (TIME.tv_sec != OLDTIME) { + OLDTIME = TIME.tv_sec; +#ifndef WIN32 + getrusage(RUSAGE_SELF, &ru); + stats->LastSampled = TIME; + stats->LastCPU = ru.ru_utime; +#else + WindowsIPC->Check(); +#endif + /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */ - if (TIME < OLDTIME - 2) + if (TIME.tv_sec < OLDTIME - 2) { - SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME); + SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME.tv_sec); } - else if (TIME > OLDTIME + 2) + else if (TIME.tv_sec > OLDTIME + 2) { - SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME - OLDTIME); + SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME.tv_sec - OLDTIME); } - if ((TIME % 3600) == 0) + if ((TIME.tv_sec % 3600) == 0) { this->RehashUsersAndChans(); - FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); + FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); } - Timers->TickTimers(TIME); + Timers->TickTimers(TIME.tv_sec); this->DoBackgroundUserStuff(); - if ((TIME % 5) == 0) + if ((TIME.tv_sec % 5) == 0) { - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec)); SNO->FlushSnotices(); } -#ifndef WIN32 - /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ - if (!getrusage(RUSAGE_SELF, &ru)) - { - gettimeofday(&this->stats->LastSampled, NULL); - this->stats->LastCPU = ru.ru_utime; - } -#else - WindowsIPC->Check(); -#endif } /* Call the socket engine to wait on the active @@ -823,10 +777,12 @@ int InspIRCd::Run() * This will cause any read or write events to be * dispatched to their handlers. */ + this->SE->DispatchTrialWrites(); this->SE->DispatchEvents(); /* if any users were quit, take them out */ - this->GlobalCulls.Apply(); + GlobalCulls.Apply(); + AtomicActions.Run(); if (this->s_signal) { @@ -848,18 +804,13 @@ int InspIRCd::Run() * (until this returns true, a user will block in the waiting state, waiting to connect up to the * registration timeout maximum seconds) */ -bool InspIRCd::AllModulesReportReady(User* user) +bool InspIRCd::AllModulesReportReady(LocalUser* user) { ModResult res; - FIRST_MOD_RESULT(this, OnCheckReady, res, (user)); + FIRST_MOD_RESULT(OnCheckReady, res, (user)); return (res == MOD_RES_PASSTHRU); } -time_t InspIRCd::Time() -{ - return TIME; -} - void InspIRCd::SetSignal(int signal) { *mysig = signal;