X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=067b2a2f353f4296df7ce080e2c9a84e65ff2996;hb=581d1d8fa0ef62e20409543570390613c78e6f5b;hp=a2a634a64559697358c439a9d97bce73ee431e59;hpb=97c0e6b4c4e304a1c4e764fc06a7e2663a41743d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a2a634a64..067b2a2f3 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,51 +1,59 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar + * Copyright (C) 2012 William Pitcock + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Oliver Lupton + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Install: src/inspircd $(BINPATH) */ + #include "inspircd.h" #include -#ifndef WIN32 - #include +#ifndef _WIN32 #include #include - #include #include - - /* Some systems don't define RUSAGE_SELF. This should fix them. */ - #ifndef RUSAGE_SELF - #define RUSAGE_SELF 0 - #endif - #include // setuid #include // setgid +#else + WORD g_wOriginalColors; + WORD g_wBackgroundColor; + HANDLE g_hStdout; #endif #include +#include #include "xline.h" -#include "bancache.h" -#include "socketengine.h" -#include "inspircd_se_config.h" -#include "socket.h" -#include "command_parse.h" #include "exitcodes.h" -#include "caller.h" -#include "testsuite.h" -InspIRCd* SI = NULL; -int* mysig = NULL; +InspIRCd* ServerInstance = NULL; -/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping +/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping * if it must. * * This is provided as a pointer so that modules can change it to their custom mapping tables, @@ -59,247 +67,385 @@ unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map; */ const char* ExitCodes[] = { - "No error", /* 0 */ - "DIE command", /* 1 */ - "execv() failed", /* 2 */ - "Internal error", /* 3 */ - "Config file error", /* 4 */ - "Logfile error", /* 5 */ - "POSIX fork failed", /* 6 */ - "Bad commandline parameters", /* 7 */ - "No ports could be bound", /* 8 */ - "Can't write PID file", /* 9 */ - "SocketEngine could not initialize", /* 10 */ - "Refusing to start up as root", /* 11 */ - "Found a tag!", /* 12 */ - "Couldn't load module on startup", /* 13 */ - "Could not create windows forked process", /* 14 */ - "Received SIGTERM", /* 15 */ - "Bad command handler loaded", /* 16 */ - "RegisterServiceCtrlHandler failed", /* 17 */ - "UpdateSCMStatus failed", /* 18 */ - "CreateEvent failed" /* 19 */ + "No error", // 0 + "DIE command", // 1 + "Config file error", // 2 + "Logfile error", // 3 + "POSIX fork failed", // 4 + "Bad commandline parameters", // 5 + "Can't write PID file", // 6 + "SocketEngine could not initialize", // 7 + "Refusing to start up as root", // 8 + "Couldn't load module on startup", // 9 + "Received SIGTERM" // 10 }; -template static void DeleteZero(T* n) +namespace { - if (n != NULL) - { - delete n; - n = NULL; - } -} + void VoidSignalHandler(int); -void InspIRCd::Cleanup() -{ - if (Config) + // Warns a user running as root that they probably shouldn't. + void CheckRoot() { - for (unsigned int i = 0; i < Config->ports.size(); i++) +#ifndef _WIN32 + if (getegid() != 0 && geteuid() != 0) + return; + + std::cout << con_red << "Warning!" << con_reset << " You have started as root. Running as root is generally not required" << std::endl + << "and may allow an attacker to gain access to your system if they find a way to" << std::endl + << "exploit your IRC server." << std::endl + << std::endl; + if (isatty(fileno(stdout))) + { + std::cout << "InspIRCd will start in 30 seconds. If you are sure that you need to run as root" << std::endl + << "then you can pass the " << con_bright << "--runasroot" << con_reset << " option to disable this wait." << std::endl; + sleep(30); + } + else { - /* This calls the constructor and closes the listening socket */ - delete Config->ports[i]; + std::cout << "If you are sure that you need to run as root then you can pass the " << con_bright << "--runasroot" << con_reset << std::endl + << "option to disable this error." << std::endl; + ServerInstance->Exit(EXIT_STATUS_ROOT); } +#endif + } - Config->ports.clear(); + // Collects performance statistics for the STATS command. + void CollectStats() + { +#ifndef _WIN32 + static rusage ru; + if (getrusage(RUSAGE_SELF, &ru) == -1) + return; // Should never happen. + + ServerInstance->stats.LastSampled.tv_sec = ServerInstance->Time(); + ServerInstance->stats.LastSampled.tv_nsec = ServerInstance->Time_ns(); + ServerInstance->stats.LastCPU = ru.ru_utime; +#else + if (!QueryPerformanceCounter(&ServerInstance->stats.LastSampled)) + return; // Should never happen. + + FILETIME CreationTime; + FILETIME ExitTime; + FILETIME KernelTime; + FILETIME UserTime; + GetProcessTimes(GetCurrentProcess(), &CreationTime, &ExitTime, &KernelTime, &UserTime); + + ServerInstance->stats.LastCPU.dwHighDateTime = KernelTime.dwHighDateTime + UserTime.dwHighDateTime; + ServerInstance->stats.LastCPU.dwLowDateTime = KernelTime.dwLowDateTime + UserTime.dwLowDateTime; +#endif } - /* Close all client sockets, or the new process inherits them */ - for (std::vector::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++) + // Checks whether the server clock has skipped too much and warn about it if it has. + void CheckTimeSkip(time_t oldtime, time_t newtime) { - this->Users->QuitUser((*i), "Server shutdown"); - (*i)->CloseSocket(); + if (!ServerInstance->Config->TimeSkipWarn) + return; + + time_t timediff = newtime - oldtime; + + if (timediff > ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff); + + else if (timediff < -ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff)); } - /* 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++) + // Drops to the unprivileged user/group specified in . + void DropRoot() { - std::vector module_names = Modules->GetAllModuleNames(0); - for (std::vector::iterator k = module_names.begin(); k != module_names.end(); ++k) +#ifndef _WIN32 + ConfigTag* security = ServerInstance->Config->ConfValue("security"); + + const std::string SetGroup = security->getString("runasgroup"); + if (!SetGroup.empty()) { - /* Unload all modules, so they get a chance to clean up their listeners */ - this->Modules->Unload(k->c_str()); - } - } - /* Remove core commands */ - Parser->RemoveCommands(""); + errno = 0; + if (setgroups(0, NULL) == -1) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno)); + exit(EXIT_STATUS_CONFIG); + } - /* Cleanup Server Names */ - for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) - delete (*itr); + struct group* g = getgrnam(SetGroup.c_str()); + if (!g) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno)); + exit(EXIT_STATUS_CONFIG); + } - /* 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 */ - DeleteZero(this->Users); - DeleteZero(this->Modes); - DeleteZero(this->XLines); - DeleteZero(this->Parser); - DeleteZero(this->stats); - DeleteZero(this->Modules); - DeleteZero(this->BanCache); - DeleteZero(this->SNO); - DeleteZero(this->Config); - DeleteZero(this->Res); - DeleteZero(this->chanlist); - DeleteZero(this->PI); - DeleteZero(this->Threads); - DeleteZero(this->Timers); - /* Close logging */ - this->Logs->CloseLogs(); - DeleteZero(this->Logs); -} + if (setgid(g->gr_gid) == -1) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setgid(%d) failed (wrong group?): %s", g->gr_gid, strerror(errno)); + exit(EXIT_STATUS_CONFIG); + } + } -void InspIRCd::Restart(const std::string &reason) -{ - /* SendError flushes each client's queue, - * regardless of writeability state - */ - this->SendError(reason); + const std::string SetUser = security->getString("runasuser"); + if (!SetUser.empty()) + { + errno = 0; + struct passwd* u = getpwnam(SetUser.c_str()); + if (!u) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno)); + exit(EXIT_STATUS_CONFIG); + } - /* Figure out our filename (if theyve renamed it, we're boned) */ - std::string me; + if (setuid(u->pw_uid) == -1) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "setuid(%d) failed (wrong user?): %s", u->pw_uid, strerror(errno)); + exit(EXIT_STATUS_CONFIG); + } + } +#endif + } -#ifdef WINDOWS - char module[MAX_PATH]; - if (GetModuleFileName(NULL, module, MAX_PATH)) - me = module; + // Expands a path relative to the current working directory. + std::string ExpandPath(const char* path) + { +#ifdef _WIN32 + TCHAR configPath[MAX_PATH + 1]; + if (GetFullPathName(path, MAX_PATH, configPath, NULL) > 0) + return configPath; #else - me = Config->MyDir + "/inspircd"; + char configPath[PATH_MAX + 1]; + if (realpath(path, configPath)) + return configPath; #endif + return path; + } - char** argv = Config->argv; - - this->Cleanup(); + // Locates a config file on the file system. + bool FindConfigFile(std::string& path) + { + if (FileSystem::FileExists(path)) + return true; + +#ifdef _WIN32 + // Windows hides file extensions by default so try appending .txt to the path + // to help users who have that feature enabled and can't create .conf files. + const std::string txtpath = path + ".txt"; + if (FileSystem::FileExists(txtpath)) + { + path.assign(txtpath); + return true; + } +#endif + return false; + } - if (execv(me.c_str(), argv) == -1) + // Attempts to fork into the background. + void ForkIntoBackground() { - /* Will raise a SIGABRT if not trapped */ - throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno)); +#ifndef _WIN32 + // We use VoidSignalHandler whilst forking to avoid breaking daemon scripts + // if the parent process exits with SIGTERM (15) instead of EXIT_STATUS_NOERROR (0). + signal(SIGTERM, VoidSignalHandler); + + errno = 0; + int childpid = fork(); + if (childpid < 0) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "fork() failed: %s", strerror(errno)); + std::cout << con_red << "Error:" << con_reset << " unable to fork into background: " << strerror(errno); + ServerInstance->Exit(EXIT_STATUS_FORK); + } + else if (childpid > 0) + { + // Wait until the child process kills the parent so that the shell prompt + // doesnt display over the output. Sending a kill with a signal of 0 just + // checks that the child pid is still running. If it is not then an error + // happened and the parent should exit. + while (kill(childpid, 0) != -1) + sleep(1); + exit(EXIT_STATUS_NOERROR); + } + else + { + setsid(); + signal(SIGTERM, InspIRCd::SetSignal); + SocketEngine::RecoverFromFork(); + } +#endif } -} -void InspIRCd::ResetMaxBans() -{ - for (chan_hash::const_iterator i = chanlist->begin(); i != chanlist->end(); i++) - i->second->ResetMaxBans(); -} + // Increase the size of a core dump file to improve debugging problems. + void IncreaseCoreDumpSize() + { +#ifndef _WIN32 + errno = 0; + rlimit rl; + if (getrlimit(RLIMIT_CORE, &rl) == -1) + { + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: getrlimit(RLIMIT_CORE) failed: %s", strerror(errno)); + return; + } -/** 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 - * empty buckets to be weeded out of the hash. We dont do this on a timer, as its - * very expensive, so instead we do it when the user types /REHASH and expects a - * short delay anyway. - */ -void InspIRCd::RehashUsersAndChans() -{ - user_hash* old_users = this->Users->clientlist; - user_hash* old_uuid = this->Users->uuidlist; - chan_hash* old_chans = this->chanlist; + rl.rlim_cur = rl.rlim_max; + if (setrlimit(RLIMIT_CORE, &rl) == -1) + ServerInstance->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to increase core dump size: setrlimit(RLIMIT_CORE) failed: %s", strerror(errno)); +#endif + } - this->Users->clientlist = new user_hash(); - this->Users->uuidlist = new user_hash(); - this->chanlist = new chan_hash(); + // Parses the command line options. + void ParseOptions() + { + int do_debug = 0, do_nofork = 0, do_nolog = 0; + int do_nopid = 0, do_runasroot = 0, do_version = 0; + struct option longopts[] = + { + { "config", required_argument, NULL, 'c' }, + { "debug", no_argument, &do_debug, 1 }, + { "nofork", no_argument, &do_nofork, 1 }, + { "nolog", no_argument, &do_nolog, 1 }, + { "nopid", no_argument, &do_nopid, 1 }, + { "runasroot", no_argument, &do_runasroot, 1 }, + { "version", no_argument, &do_version, 1 }, + { 0, 0, 0, 0 } + }; + + char** argv = ServerInstance->Config->cmdline.argv; + int ret; + while ((ret = getopt_long(ServerInstance->Config->cmdline.argc, argv, ":c:", longopts, NULL)) != -1) + { + switch (ret) + { + case 0: + // A long option was specified. + break; + + case 'c': + // The -c option was specified. + ServerInstance->ConfigFileName = ExpandPath(optarg); + break; + + default: + // An unknown option was specified. + std::cout << con_red << "Error:" << con_reset << " unknown option '" << argv[optind - 1] << "'." << std::endl + << con_bright << "Usage: " << con_reset << argv[0] << " [--config ] [--debug] [--nofork] [--nolog]" << std::endl + << std::string(strlen(argv[0]) + 8, ' ') << "[--nopid] [--runasroot] [--version]" << std::endl; + ServerInstance->Exit(EXIT_STATUS_ARGV); + break; + } + } - for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) - this->Users->clientlist->insert(*n); + if (do_version) + { + std::cout << std::endl << INSPIRCD_VERSION << std::endl; + ServerInstance->Exit(EXIT_STATUS_NOERROR); + } - delete old_users; + // Store the relevant parsed arguments + ServerInstance->Config->cmdline.forcedebug = !!do_debug; + ServerInstance->Config->cmdline.nofork = !!do_nofork; + ServerInstance->Config->cmdline.runasroot = !!do_runasroot; + ServerInstance->Config->cmdline.writelog = !do_nolog; + ServerInstance->Config->cmdline.writepid = !do_nopid; + } + // Seeds the random number generator if applicable. + void SeedRng(timespec ts) + { +#if defined _WIN32 + srand(ts.tv_nsec ^ ts.tv_sec); +#elif !defined HAS_ARC4RANDOM_BUF + srandom(ts.tv_nsec ^ ts.tv_sec); +#endif + } - for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++) - this->Users->uuidlist->insert(*n); + // Sets handlers for various process signals. + void SetSignals() + { +#ifndef _WIN32 + signal(SIGALRM, SIG_IGN); + signal(SIGCHLD, SIG_IGN); + signal(SIGHUP, InspIRCd::SetSignal); + signal(SIGPIPE, SIG_IGN); + signal(SIGUSR1, SIG_IGN); + signal(SIGUSR2, SIG_IGN); + signal(SIGXFSZ, SIG_IGN); +#endif + signal(SIGTERM, InspIRCd::SetSignal); + } - delete old_uuid; + void TryBindPorts() + { + FailedPortList pl; + ServerInstance->BindPorts(pl); - for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++) - this->chanlist->insert(*n); + if (!pl.empty()) + { + std::cout << con_red << "Warning!" << con_reset << " Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl + << std::endl; - delete old_chans; -} + for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter) + { + const FailedPort& fp = *iter; + std::cout << " " << con_bright << fp.sa.str() << con_reset << ": " << strerror(fp.error) << '.' << std::endl + << " " << "Created from tag at " << fp.tag->getTagLocation() << std::endl + << std::endl; + } -void InspIRCd::SetSignals() -{ -#ifndef WIN32 - signal(SIGALRM, SIG_IGN); - signal(SIGHUP, InspIRCd::SetSignal); - signal(SIGPIPE, SIG_IGN); - signal(SIGCHLD, SIG_IGN); - /* We want E2BIG not a signal! */ - signal(SIGXFSZ, SIG_IGN); -#endif - signal(SIGTERM, InspIRCd::SetSignal); -} + std::cout << con_bright << "Hints:" << con_reset << std::endl + << "- For TCP/IP listeners try using a public IP address in instead" << std::endl + << " of * or leaving it blank." << std::endl + << "- For UNIX socket listeners try enabling to replace old sockets." << std::endl; + } + } -void InspIRCd::QuickExit(int status) -{ - exit(0); + // Required for returning the proper value of EXIT_SUCCESS for the parent process. + void VoidSignalHandler(int) + { + exit(EXIT_STATUS_NOERROR); + } } -bool InspIRCd::DaemonSeed() +void InspIRCd::Cleanup() { -#ifdef WINDOWS - printf_c("InspIRCd Process ID: \033[1;32m%lu\033[0m\n", GetCurrentProcessId()); - return true; -#else - signal(SIGTERM, InspIRCd::QuickExit); - - int childpid; - if ((childpid = fork ()) < 0) - return false; - else if (childpid > 0) + // Close all listening sockets + for (unsigned int i = 0; i < ports.size(); i++) { - /* We wait here for the child process to kill us, - * so that the shell prompt doesnt come back over - * the output. - * Sending a kill with a signal of 0 just checks - * if the child pid is still around. If theyre not, - * they threw an error and we should give up. - */ - while (kill(childpid, 0) != -1) - sleep(1); - exit(0); + ports[i]->cull(); + delete ports[i]; } - setsid (); - umask (007); - printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); + ports.clear(); - signal(SIGTERM, InspIRCd::SetSignal); + // Tell modules that we're shutting down. + const std::string quitmsg = "Server shutting down"; + FOREACH_MOD(OnShutdown, (quitmsg)); - rlimit rl; - if (getrlimit(RLIMIT_CORE, &rl) == -1) - { - this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!"); - return false; - } - else + // Disconnect all local users + const UserManager::LocalList& list = Users.GetLocalUsers(); + while (!list.empty()) + ServerInstance->Users.QuitUser(list.front(), quitmsg); + + 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) { - rl.rlim_cur = rl.rlim_max; - if (setrlimit(RLIMIT_CORE, &rl) == -1) - this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size."); + delete FakeClient->server; + FakeClient->cull(); } - - return true; -#endif + stdalgo::delete_zero(this->FakeClient); + stdalgo::delete_zero(this->XLines); + stdalgo::delete_zero(this->Config); + SocketEngine::Deinit(); + Logs->CloseLogs(); } -void InspIRCd::WritePID(const std::string &filename) +void InspIRCd::WritePID(const std::string& filename, bool exitonfail) { - std::string fname = (filename.empty() ? "inspircd.pid" : filename); - std::replace(fname.begin(), fname.end(), '\\', '/'); - if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename))) +#ifndef _WIN32 + if (!ServerInstance->Config->cmdline.writepid) { - 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; - } + this->Logs->Log("STARTUP", LOG_DEFAULT, "--nopid specified on command line; PID file not written."); + return; } + + std::string fname = ServerInstance->Config->Paths.PrependData(filename.empty() ? "inspircd.pid" : filename); std::ofstream outfile(fname.c_str()); if (outfile.is_open()) { @@ -308,545 +454,250 @@ void InspIRCd::WritePID(const std::string &filename) } else { - printf("Failed to write PID-file '%s', exiting.\n",fname.c_str()); - this->Logs->Log("STARTUP",DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str()); - Exit(EXIT_STATUS_PID); + if (exitonfail) + std::cout << "Failed to write PID-file '" << fname << "', exiting." << std::endl; + this->Logs->Log("STARTUP", LOG_DEFAULT, "Failed to write PID-file '%s'%s", fname.c_str(), (exitonfail ? ", exiting." : "")); + if (exitonfail) + Exit(EXIT_STATUS_PID); } +#endif } InspIRCd::InspIRCd(int argc, char** argv) - : GlobalCulls(this), - - /* 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), - HandleFloodQuitUser(this), - 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), - FloodQuitUser(&HandleFloodQuitUser) - + : FakeClient(NULL) + , ConfigFileName(INSPIRCD_CONFIG_PATH "/inspircd.conf") + , ConfigThread(NULL) + , Config(NULL) + , XLines(NULL) + , PI(&DefaultProtocolInterface) + , GenRandom(&DefaultGenRandom) + , IsChannel(&DefaultIsChannel) + , IsNick(&DefaultIsNick) + , IsIdent(&DefaultIsIdent) { -#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, do_testsuite = 0; /* flag variables */ - int 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; - - // Initialise TIME - this->TIME = time(NULL); - - 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->Threads = new ThreadEngine(this); - - /* Default implementation does nothing */ - this->PI = new ProtocolInterface(this); - - 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->Config = new ServerConfig(this); - this->SNO = new SnomaskManager(this); - this->BanCache = new BanCacheManager(this); - this->Modules = new ModuleManager(this); - this->stats = new serverstats(); - this->Timers = new TimerManager(this); - this->Parser = new CommandParser(this); - this->XLines = new XLineManager(this); - - this->Config->argv = argv; - this->Config->argc = argc; - - if (chdir(Config->GetFullProgDir().c_str())) - { - printf("Unable to change to my directory: %s\nAborted.", strerror(errno)); - exit(0); - } + ServerInstance = this; - this->Config->opertypes.clear(); - this->Config->operclass.clear(); + UpdateTime(); + this->startup_time = TIME.tv_sec; - this->TIME = this->OLDTIME = this->startup_time = time(NULL); - srand(this->TIME); + IncreaseCoreDumpSize(); + SeedRng(TIME); + SocketEngine::Init(); - *this->LogFileName = 0; - strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF); + this->Config = new ServerConfig; + dynamic_reference_base::reset_all(); + this->XLines = new XLineManager; - struct option longopts[] = - { - { "nofork", no_argument, &do_nofork, 1 }, - { "logfile", required_argument, NULL, 'f' }, - { "config", required_argument, NULL, 'c' }, - { "debug", no_argument, &do_debug, 1 }, - { "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 } - }; - - int index; - while ((c = getopt_long_only(argc, argv, ":f:", longopts, &index)) != -1) - { - switch (c) - { - case 'f': - /* Log filename was set */ - strlcpy(LogFileName, optarg, MAXBUF); - break; - case 'c': - /* Config filename was set */ - strlcpy(ConfigFileName, optarg, MAXBUF); - break; - case 0: - /* getopt_long_only() set an int variable, just keep going */ - break; - case '?': - /* Unknown parameter */ - default: - /* Fall through to handle other weird values too */ - printf("Unknown parameter '%s'\n", argv[index]); - 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; + this->Config->cmdline.argv = argv; + this->Config->cmdline.argc = argc; - if (do_version) +#ifdef _WIN32 + // Initialize the console values + g_hStdout = GetStdHandle(STD_OUTPUT_HANDLE); + CONSOLE_SCREEN_BUFFER_INFO bufinf; + if(GetConsoleScreenBufferInfo(g_hStdout, &bufinf)) { - printf("\n%s r%s\n", VERSION, REVISION); - Exit(EXIT_STATUS_NOERROR); + g_wOriginalColors = bufinf.wAttributes & 0x00FF; + g_wBackgroundColor = bufinf.wAttributes & 0x00F0; } - -#ifdef WIN32 - - // Handle forking - if(!do_nofork) + else { - DWORD ExitCode = WindowsForkStart(this); - if(ExitCode) - exit(ExitCode); + g_wOriginalColors = FOREGROUND_RED|FOREGROUND_BLUE|FOREGROUND_GREEN; + g_wBackgroundColor = 0; } - - // Set up winsock - WSADATA wsadata; - WSAStartup(MAKEWORD(2,0), &wsadata); - ChangeWindowsSpecificPointers(this); #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)); - Exit(EXIT_STATUS_LOG); - } - - if (!ServerConfig::FileExists(this->ConfigFileName)) - { -#ifdef WIN32 - /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */ - std::string txtconf = this->ConfigFileName; - txtconf.append(".txt"); - - if (ServerConfig::FileExists(txtconf.c_str())) + ServiceProvider* provs[] = { - strlcat(this->ConfigFileName, ".txt", MAXBUF); - } - 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); - Exit(EXIT_STATUS_CONFIG); - } + &rfcevents.numeric, &rfcevents.join, &rfcevents.part, &rfcevents.kick, &rfcevents.quit, &rfcevents.nick, + &rfcevents.mode, &rfcevents.topic, &rfcevents.privmsg, &rfcevents.invite, &rfcevents.ping, &rfcevents.pong, + &rfcevents.error + }; + Modules.AddServices(provs, sizeof(provs)/sizeof(provs[0])); } - 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:\n"); - printf_c("\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\n"); - 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"); - - Config->ClearStack(); + std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << std::endl + << "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl + << std::endl; - this->Modes = new ModeParser(this); - - if (!do_root) - this->CheckRoot(); - else + ParseOptions(); + if (Config->cmdline.forcedebug) { - printf("* WARNING * WARNING * WARNING * WARNING * WARNING * \n\n"); - printf("YOU ARE RUNNING INSPIRCD AS ROOT. THIS IS UNSUPPORTED\n"); - printf("AND IF YOU ARE HACKED, CRACKED, SPINDLED OR MUTILATED\n"); - printf("OR ANYTHING ELSE UNEXPECTED HAPPENS TO YOU OR YOUR\n"); - printf("SERVER, THEN IT IS YOUR OWN FAULT. IF YOU DID NOT MEAN\n"); - printf("TO START INSPIRCD AS ROOT, HIT CTRL+C NOW AND RESTART\n"); - printf("THE PROGRAM AS A NORMAL USER. YOU HAVE BEEN WARNED!\n"); - printf("\nInspIRCd starting in 20 seconds, ctrl+c to abort...\n"); - sleep(20); + FileWriter* fw = new FileWriter(stdout, 1); + FileLogStream* fls = new FileLogStream(LOG_RAWIO, fw); + Logs->AddLogTypes("*", fls, true); } - this->SetSignals(); - - if (!Config->nofork) + if (!FindConfigFile(ConfigFileName)) { - if (!this->DaemonSeed()) - { - printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Logs->Log("STARTUP", DEFAULT, "ERROR: could not go into daemon mode. Shutting down."); - Exit(EXIT_STATUS_FORK); - } + this->Logs->Log("STARTUP", LOG_DEFAULT, "Unable to open config file %s", ConfigFileName.c_str()); + std::cout << "ERROR: Cannot open config file: " << ConfigFileName << std::endl << "Exiting..." << std::endl; + Exit(EXIT_STATUS_CONFIG); } - SE->RecoverFromFork(); + SetSignals(); + if (!Config->cmdline.runasroot) + CheckRoot(); + if (!Config->cmdline.nofork) + ForkIntoBackground(); + + std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl; - /* During startup we don't actually initialize this - * in the thread engine. + /* During startup we read the configuration now, not in + * a separate thread */ - this->ConfigThread = new ConfigReaderThread(this, true, ""); - ConfigThread->Run(); - delete ConfigThread; - this->ConfigThread = NULL; - /* Switch over logfiles */ + this->Config->Read(); + this->Config->Apply(NULL, ""); Logs->OpenFileLogs(); - /** Note: This is safe, the method checks for user == NULL */ - this->Parser->SetupCommandTable(); + // If we don't have a SID, generate one based on the server name and the server description + if (Config->sid.empty()) + Config->sid = UIDGenerator::GenerateSID(Config->ServerName, Config->ServerDesc); - 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; - - 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'; - } + // Initialize the UID generator with our sid + this->UIDGen.init(Config->sid); - /* set up fake client again this time with the correct uid */ - this->FakeClient = new FakeUser(this, "!"); - this->FakeClient->SetFakeServer(Config->ServerName); + // Create the server user for this server + this->FakeClient = new FakeUser(Config->sid, Config->ServerName, Config->ServerDesc); - // Get XLine to do it's thing. - this->XLines->CheckELines(); + // This is needed as all new XLines are marked pending until ApplyLines() is called this->XLines->ApplyLines(); - CheckDie(); - int bounditems = BindPorts(true, found_ports, pl); + std::cout << std::endl; - printf("\n"); + TryBindPorts(); this->Modules->LoadAll(); - /* Just in case no modules were loaded - fix for bug #101 */ - this->BuildISupport(); - InitializeDisabledCommands(Config->DisabledCommands, this); + // Build ISupport as ModuleManager::LoadAll() does not do it + this->ISupport.Build(); - 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.\tAddress: %s\tReason: %s\n", j, i->first.empty() ? "" : i->first.c_str(), i->second.c_str()); - } - } + std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl; - 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) +#ifndef _WIN32 + if (!Config->cmdline.nofork) { if (kill(getppid(), SIGTERM) == -1) { - printf("Error killing parent process: %s\n",strerror(errno)); - Logs->Log("STARTUP", DEFAULT, "Error killing parent process: %s",strerror(errno)); + std::cout << "Error killing parent process: " << strerror(errno) << std::endl; + Logs->Log("STARTUP", LOG_DEFAULT, "Error killing parent process: %s",strerror(errno)); } } - if (isatty(0) && isatty(1) && isatty(2)) + /* Explicitly shut down stdio's stdin/stdout/stderr. + * + * The previous logic here was to only do this if stdio was connected to a controlling + * terminal. However, we must do this always to avoid information leaks and other + * problems related to stdio. + * + * The only exception is if we are in debug mode. + * + * -- nenolod + */ + if ((!Config->cmdline.nofork) && (!Config->cmdline.forcedebug)) { - /* We didn't start from a TTY, we must have started from a background process - - * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont - * close stdin/stdout - */ - if ((!do_nofork) && (!do_testsuite)) - { - fclose(stdin); - fclose(stderr); - fclose(stdout); - } - else - { - Logs->Log("STARTUP", DEFAULT,"Keeping pseudo-tty open as we are running in the foreground."); - } + int fd = open("/dev/null", O_RDWR); + + fclose(stdin); + fclose(stderr); + fclose(stdout); + + if (dup2(fd, STDIN_FILENO) < 0) + Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stdin."); + if (dup2(fd, STDOUT_FILENO) < 0) + Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stdout."); + if (dup2(fd, STDERR_FILENO) < 0) + Logs->Log("STARTUP", LOG_DEFAULT, "Failed to dup /dev/null to stderr."); + close(fd); } -#else - WindowsIPC = new IPC(this); - if(!Config->nofork) + else { - WindowsForkKillOwner(this); - FreeConsole(); + Logs->Log("STARTUP", LOG_DEFAULT, "Keeping pseudo-tty open as we are running in the foreground."); } +#else /* 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()); - -#ifndef WIN32 - if (*(this->Config->SetGroup)) + // Handle forking + if(!Config->cmdline.nofork) { - int ret; - - // setgroups - ret = setgroups(0, NULL); - - if (ret == -1) - { - this->Logs->Log("SETGROUPS", DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno)); - this->QuickExit(0); - } - - // setgid - struct group *g; - - errno = 0; - g = getgrnam(this->Config->SetGroup); - - if (!g) - { - this->Logs->Log("SETGUID", DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno)); - this->QuickExit(0); - } - - ret = setgid(g->gr_gid); - - if (ret == -1) - { - this->Logs->Log("SETGUID", DEFAULT, "setgid() failed (bad user?): %s", strerror(errno)); - this->QuickExit(0); - } + FreeConsole(); } - if (*(this->Config->SetUser)) - { - // setuid - struct passwd *u; + QueryPerformanceFrequency(&stats.QPFrequency); +#endif - errno = 0; - u = getpwnam(this->Config->SetUser); + WritePID(Config->PID); + DropRoot(); - if (!u) - { - this->Logs->Log("SETGUID", DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno)); - this->QuickExit(0); - } + Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %lu max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds()); +} - int ret = setuid(u->pw_uid); +void InspIRCd::UpdateTime() +{ +#if defined HAS_CLOCK_GETTIME + clock_gettime(CLOCK_REALTIME, &TIME); +#elif defined _WIN32 + SYSTEMTIME st; + GetSystemTime(&st); + + TIME.tv_sec = time(NULL); + TIME.tv_nsec = st.wMilliseconds; +#else + struct timeval tv; + gettimeofday(&tv, NULL); - if (ret == -1) - { - this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (bad user?): %s", strerror(errno)); - this->QuickExit(0); - } - } + TIME.tv_sec = tv.tv_sec; + TIME.tv_nsec = tv.tv_usec * 1000; #endif - - this->WritePID(Config->PID); } -int InspIRCd::Run() +void 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); - } + UpdateTime(); + time_t OLDTIME = TIME.tv_sec; while (true) { -#ifndef WIN32 - static rusage ru; -#else - static time_t uptime; - static struct tm * stime; - 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->IsDone()) { /* Rehash has completed */ + this->Logs->Log("CONFIG", LOG_DEBUG, "Detected ConfigThread exiting, tidying up..."); - /* Switch over logfiles */ - Logs->CloseLogs(); - Logs->OpenFileLogs(); - - this->Logs->Log("CONFIG",DEBUG,"Detected ConfigThread exiting, tidying up..."); - - /* 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. This might - * not be worth the effort however as these functions execute relatively quickly - * and would not benefit from being within the config read thread. - * - * 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); - User* user = !Config->RehashUserUID.empty() ? FindNick(Config->RehashUserUID) : NULL; - FOREACH_MOD_I(this, I_OnRehash, OnRehash(user, Config->RehashParameter)); - this->BuildISupport(); - - /* 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. - */ + this->ConfigThread->Finish(); + + ConfigThread->join(); delete ConfigThread; 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 + * (the docs say modules should not rely on accurate * timing using this event, so we dont have to * time this exactly). */ - if (TIME != OLDTIME) + if (TIME.tv_sec != OLDTIME) { - /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */ - if (TIME < OLDTIME - 2) - { - SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)OLDTIME-TIME); - } - else if (TIME > OLDTIME + 2) - { - SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME - OLDTIME); - } + CollectStats(); + CheckTimeSkip(OLDTIME, TIME.tv_sec); - if ((TIME % 3600) == 0) - { - this->RehashUsersAndChans(); - FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); - } + OLDTIME = TIME.tv_sec; - Timers->TickTimers(TIME); - this->DoBackgroundUserStuff(); + if ((TIME.tv_sec % 3600) == 0) + FOREACH_MOD(OnGarbageCollect, ()); - if ((TIME % 5) == 0) + Timers.TickTimers(TIME.tv_sec); + Users->DoBackgroundUserStuff(); + + if ((TIME.tv_sec % 5) == 0) { - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + FOREACH_MOD(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 @@ -856,64 +707,26 @@ int InspIRCd::Run() * This will cause any read or write events to be * dispatched to their handlers. */ - this->SE->DispatchEvents(); + SocketEngine::DispatchTrialWrites(); + SocketEngine::DispatchEvents(); /* if any users were quit, take them out */ - this->GlobalCulls.Apply(); - - /* If any inspsockets closed, remove them */ - this->BufferedSocketCull(); + GlobalCulls.Apply(); + AtomicActions.Run(); - if (this->s_signal) + if (s_signal) { this->SignalHandler(s_signal); - this->s_signal = 0; + s_signal = 0; } } - - return 0; -} - -void InspIRCd::BufferedSocketCull() -{ - for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) - { - this->Logs->Log("MISC",DEBUG,"Cull socket"); - SE->DelFd(x->second); - x->second->Close(); - delete x->second; - } - SocketCull.clear(); -} - -/**********************************************************************************/ - -/** - * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*. - */ - -/* this returns true when all modules are satisfied that the user should be allowed onto the irc server - * (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) -{ - for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i) - { - if (!(*i)->OnCheckReady(user)) - return false; - } - return true; } -time_t InspIRCd::Time() -{ - return TIME; -} +sig_atomic_t InspIRCd::s_signal = 0; void InspIRCd::SetSignal(int signal) { - *mysig = signal; + s_signal = signal; } /* On posix systems, the flow of the program starts right here, with @@ -924,9 +737,8 @@ void InspIRCd::SetSignal(int signal) */ ENTRYPOINT { - SI = new InspIRCd(argc, argv); - mysig = &SI->s_signal; - SI->Run(); - delete SI; + new InspIRCd(argc, argv); + ServerInstance->Run(); + delete ServerInstance; return 0; }