X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=2ac844bb6abfa625705b493c6ff4bb4d02b2fb2a;hb=7aab0d12db670fea68a258d9ae2b05ea5c4615be;hp=e6d453ed272476fcf1f61b76bd50204cf03a31bd;hpb=05e88fcd544e3cc22cfdd080a829cf835531d6ee;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index e6d453ed2..2ac844bb6 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,9 +11,9 @@ * --------------------------------------------------- */ -/* $Install: src/inspircd $(BINPATH) */ - +/* $Core */ #include "inspircd.h" +#include "inspircd_version.h" #include #ifndef WIN32 @@ -27,27 +27,36 @@ #ifndef RUSAGE_SELF #define RUSAGE_SELF 0 #endif + + #include // setuid + #include // setgid #endif #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" -using irc::sockets::insp_ntoa; -using irc::sockets::insp_inaddr; -using irc::sockets::insp_sockaddr; - -InspIRCd* SI = NULL; +InspIRCd* ServerInstance = NULL; int* mysig = NULL; +/** Seperate 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, + * e.g. for national character support. + */ +unsigned const char *national_case_insensitive_map = rfc_case_insensitive_map; + -/* 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 */ @@ -66,52 +75,65 @@ const char* ExitCodes[] = "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 */ }; +template static void DeleteZero(T*&n) +{ + 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 < Config->ports.size(); i++) - { - /* This calls the constructor and closes the listening socket */ - delete Config->ports[i]; - } - - Config->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 */ - for (std::vector::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++) + std::vector::reverse_iterator i = Users->local_users.rbegin(); + while (i != this->Users->local_users.rend()) { - (*i)->SetWriteError("Server shutdown"); - (*i)->CloseSocket(); - } - - /* 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. - */ - for (int tries = 0; tries < 3; 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()); - } + User* u = *i++; + Users->QuitUser(u, "Server shutdown"); } + 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); + 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); + DeleteZero(this->SE); /* Close logging */ - if (this->Logger) - this->Logger->Close(); - - - /* Cleanup Server Names */ - for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr) - delete (*itr); - - + this->Logs->CloseLogs(); + DeleteZero(this->Logs); } void InspIRCd::Restart(const std::string &reason) @@ -121,20 +143,22 @@ 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; + 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 - if (execv(me.c_str(), Config->argv) == -1) + 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)); @@ -147,43 +171,41 @@ void InspIRCd::ResetMaxBans() i->second->ResetMaxBans(); } -/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature') - * we must occasionally rehash the hash (yes really). +/** Because hash_map doesn't free its buckets when we delete items, we occasionally + * recreate the hash to free them up. * 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. + * empty buckets to be weeded out of the hash. + * Since this is quite expensive, it's not done very often. */ void InspIRCd::RehashUsersAndChans() { - user_hash* old_users = this->clientlist; - user_hash* old_uuid = this->uuidlist; - chan_hash* old_chans = this->chanlist; + user_hash* old_users = Users->clientlist; + user_hash* old_uuid = Users->uuidlist; + chan_hash* old_chans = chanlist; - this->clientlist = new user_hash(); - this->uuidlist = new user_hash(); - this->chanlist = new chan_hash(); + Users->clientlist = new user_hash(); + Users->uuidlist = new user_hash(); + chanlist = new chan_hash(); for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++) - this->clientlist->insert(*n); - - delete old_users; + Users->clientlist->insert(*n); for (user_hash::const_iterator n = old_uuid->begin(); n != old_uuid->end(); n++) - this->uuidlist->insert(*n); - - delete old_uuid; + Users->uuidlist->insert(*n); for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++) - this->chanlist->insert(*n); + chanlist->insert(*n); + delete old_users; + delete old_uuid; delete old_chans; -} -void InspIRCd::CloseLog() -{ - if (this->Logger) - this->Logger->Close(); + // Reset the already_sent IDs so we don't wrap it around and drop a message + LocalUser::already_sent_id = 0; + for (std::vector::const_iterator i = Users->local_users.begin(); i != Users->local_users.end(); i++) + { + (**i).already_sent = 0; + } } void InspIRCd::SetSignals() @@ -193,6 +215,8 @@ void InspIRCd::SetSignals() 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); } @@ -227,7 +251,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); @@ -235,15 +258,13 @@ 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."); - } + 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 @@ -251,17 +272,9 @@ bool InspIRCd::DaemonSeed() void InspIRCd::WritePID(const std::string &filename) { - std::string fname = (filename.empty() ? "inspircd.pid" : filename); - if (*(fname.begin()) != '/') - { - 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()) { @@ -271,78 +284,103 @@ 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); } } -InspIRCd::InspIRCd(int argc, char** argv) - : GlobalCulls(this), - - /* Functor initialisation. Note that the ordering here is very important. */ - HandleProcessUser(this), - HandleIsNick(this), - HandleIsIdent(this), - HandleFindDescriptor(this), - HandleFloodQuitUser(this), - - /* Functor pointer initialisation. Must match the order of the list above */ - ProcessUser(&HandleProcessUser), +InspIRCd::InspIRCd(int argc, char** argv) : + 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), + GenRandom(&HandleGenRandom), + IsChannel(&HandleIsChannel), + IsSID(&HandleIsSID), + Rehash(&HandleRehash), IsNick(&HandleIsNick), IsIdent(&HandleIsIdent), - FindDescriptor(&HandleFindDescriptor), - FloodQuitUser(&HandleFloodQuitUser) - + FloodQuitUser(&HandleFloodQuitUser), + OnCheckExemption(&HandleOnCheckExemption) { +#ifdef WIN32 + // Strict, frequent checking of memory on debug builds + _CrtSetDbgFlag ( _CRTDBG_CHECK_ALWAYS_DF | _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); - int found_ports = 0; - FailedPortList pl; - int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */ - char c = 0; + // Avoid erroneous frees on early exit + WindowsIPC = 0; +#endif - memset(&server, 0, sizeof(server)); - memset(&client, 0, sizeof(client)); + ServerInstance = this; - SocketEngineFactory* SEF = new SocketEngineFactory(); - SE = SEF->Create(this); - delete SEF; + Extensions.Register(&NICKForced); + Extensions.Register(&OperQuit); + + 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; + this->ConfigThread = NULL; + + UpdateTime(); + 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; + + SE = CreateSocketEngine(); + + this->Threads = new ThreadEngine; + + /* Default implementation does nothing */ + this->PI = new ProtocolInterface; this->s_signal = 0; - this->unregistered_count = 0; + // Create base manager classes early, so nothing breaks + this->Users = new UserManager; - this->clientlist = new user_hash(); - this->uuidlist = new user_hash(); - this->chanlist = new chan_hash(); + 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->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); - this->time_delta = 0; - srand(this->TIME); - - *this->LogFileName = 0; - strlcpy(this->ConfigFileName, CONFIG_FILE, MAXBUF); + srandom(TIME.tv_nsec ^ TIME.tv_sec); struct option longopts[] = { @@ -353,32 +391,40 @@ 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 } }; - while ((c = getopt_long_only(argc, argv, ":f:", longopts, NULL)) != -1) + int index; + while ((c = getopt_long(argc, argv, ":f:", longopts, &index)) != -1) { switch (c) { 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 */ break; + case '?': + /* Unknown parameter */ default: - /* Unknown parameter! DANGER, INTRUDER.... err.... yeah. */ - printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ] [--runasroot] [--version] [--config ]\n", argv[0]); + /* Fall through to handle other weird values too */ + printf("Unknown parameter '%s'\n", argv[optind-1]); + printf("Usage: %s [--nofork] [--nolog] [--debug] [--logfile ]\n%*s[--runasroot] [--version] [--config ] [--testsuite]\n", argv[0], static_cast(8+strlen(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); @@ -390,7 +436,7 @@ InspIRCd::InspIRCd(int argc, char** argv) // Handle forking if(!do_nofork) { - DWORD ExitCode = WindowsForkStart(this); + DWORD ExitCode = WindowsForkStart(); if(ExitCode) exit(ExitCode); } @@ -398,65 +444,55 @@ InspIRCd::InspIRCd(int argc, char** argv) // Set up winsock WSADATA wsadata; WSAStartup(MAKEWORD(2,0), &wsadata); - - ChangeWindowsSpecificPointers(this); + ChangeWindowsSpecificPointers(); #endif - strlcpy(Config->MyExecutable,argv[0],MAXBUF); - if (!this->OpenLog(argv, argc)) + /* Set the finished argument values */ + Config->cmdline.nofork = do_nofork; + Config->cmdline.forcedebug = do_debug; + Config->cmdline.writelog = !do_nolog; + Config->cmdline.TestSuite = do_testsuite; + + 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(RAWIO, 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())) { - printf("ERROR: Cannot open config file: %s\nExiting...\n", this->ConfigFileName); - this->Log(DEFAULT,"Unable to open config file %s", this->ConfigFileName); - Exit(EXIT_STATUS_CONFIG); +#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())) + { + ConfigFileName = txtconf; + } + else +#endif + { + 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); + } } 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;32mpeavey, aquanight, psychon, dz, danieldg\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); - 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 - */ - /* Generate SID */ - size_t sid = 0; - if (Config->sid) - { - sid = Config->sid; - } - else - { - 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 = sid; - } - - this->InitialiseUID(); - - /* set up fake client */ - this->FakeClient = new User(this); - this->FakeClient->SetFd(FD_MAGIC_NUMBER); + this->Modes = new ModeParser; if (!do_root) this->CheckRoot(); @@ -475,81 +511,87 @@ InspIRCd::InspIRCd(int argc, char** argv) this->SetSignals(); - if (!Config->nofork) + if (!Config->cmdline.nofork) { 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(); - this->Res = new DNS(this); - - /* 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. - */ - Config->Read(true, NULL, 0); - Config->StartDownloads(); - - /* Now the downloads are started, we monitor them for completion. - * On completion, we call Read again with pass = 1 + /* During startup we don't actually initialize this + * in the thread engine. */ + this->Config->Read(); + this->Config->Apply(NULL, ""); + Logs->OpenFileLogs(); - while (Config->Downloading()) + 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.empty()) { - SE->DispatchEvents(); - this->BufferedSocketCull(); - } + // Generate one + unsigned int sid = 0; + char sidstr[4]; - /* We have all the files we can get, initiate pass 1 */ - Config->Read(true, NULL, 1); + for (const char* x = Config->ServerName.c_str(); *x; ++x) + sid = 5 * sid + *x; + for (const char* y = Config->ServerDesc.c_str(); *y; ++y) + sid = 5 * sid + *y; + sprintf(sidstr, "%03d", sid % 1000); + + Config->sid = sidstr; + } - // 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 FakeUser(Config->sid, Config->ServerName); + // Get XLine to do it's thing. + this->XLines->CheckELines(); + this->XLines->ApplyLines(); - CheckDie(); - int bounditems = BindPorts(true, found_ports, pl); + int bounditems = BindPorts(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)) - { - 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?"); - Exit(EXIT_STATUS_BIND); - } + Config->ApplyDisabledCommands(Config->DisabledCommands); - if (Config->ports.size() != (unsigned int)found_ports) + if (!pl.empty()) { - 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("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", + bounditems, bounditems + (int)pl.size()); 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("%d.\tAddress: %s\tReason: %s\n", j, i->first.empty() ? "" : i->first.c_str(), i->second.c_str()); } } + + 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) { 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)); } } @@ -559,49 +601,120 @@ 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); - fclose(stdout); + if (!Config->cmdline.forcedebug) + fclose(stdout); } 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 - WindowsIPC = new IPC(this); - if(!Config->nofork) + WindowsIPC = new IPC; + if(!Config->cmdline.nofork) { - WindowsForkKillOwner(this); + WindowsForkKillOwner(); FreeConsole(); } + /* Set win32 service as running, if we are running as a service */ + SetServiceRunning(); #endif - printf("\nInspIRCd is now running!\n"); - Log(DEFAULT,"Startup complete."); + 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 + std::string SetUser = Config->ConfValue("security")->getString("runasuser"); + std::string SetGroup = Config->ConfValue("security")->getString("runasgroup"); + if (!SetGroup.empty()) + { + 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(SetGroup.c_str()); + + 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); + } + } + + if (!SetUser.empty()) + { + // setuid + struct passwd *u; + + errno = 0; + u = getpwnam(SetUser.c_str()); + + if (!u) + { + this->Logs->Log("SETGUID", DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } + + int ret = setuid(u->pw_uid); + + if (ret == -1) + { + this->Logs->Log("SETGUID", DEFAULT, "setuid() failed (bad user?): %s", strerror(errno)); + this->QuickExit(0); + } + } +#endif this->WritePID(Config->PID); } -/* moved to a function, as UID generation can call this also */ -void InspIRCd::InitialiseUID() +void InspIRCd::UpdateTime() { - int i; - size_t sid = Config->sid; - - current_uid[0] = sid / 100 + 48; - current_uid[1] = ((sid / 10) % 10) + 48; - current_uid[2] = sid % 10 + 48; - - /* Initialise UID */ - for(i = 3; i < UUID_LENGTH - 1; i++) - current_uid[i] = 'A'; +#ifdef HAS_CLOCK_GETTIME + clock_gettime(CLOCK_REALTIME, &TIME); +#else + struct timeval tv; + gettimeofday(&tv, NULL); + TIME.tv_sec = tv.tv_sec; + TIME.tv_nsec = tv.tv_usec * 1000; +#endif } int InspIRCd::Run() { + /* See if we're supposed to be running the test suite rather than entering the mainloop */ + if (Config->cmdline.TestSuite) + { + TestSuite* ts = new TestSuite; + delete ts; + Exit(0); + } + + UpdateTime(); + time_t OLDTIME = TIME.tv_sec; + while (true) { #ifndef WIN32 @@ -612,57 +725,61 @@ int InspIRCd::Run() static char window_title[100]; #endif - /* 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); + /* 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",DEBUG,"Detected ConfigThread exiting, tidying up..."); + + this->ConfigThread->Finish(); + + ConfigThread->join(); + delete ConfigThread; + ConfigThread = 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) { - if (TIME < 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.tv_sec < OLDTIME - 2) { - WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(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.tv_sec > OLDTIME + 2) + { + 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) - { - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - Timers->TickMissedTimers(TIME); - } -#ifndef WIN32 - /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */ - if (!getrusage(RUSAGE_SELF, &ru)) + if ((TIME.tv_sec % 5) == 0) { - gettimeofday(&this->stats->LastSampled, NULL); - this->stats->LastCPU = ru.ru_utime; + FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec)); + SNO->FlushSnotices(); } -#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); - } -#endif } /* Call the socket engine to wait on the active @@ -672,13 +789,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 was quit, take them out */ - this->GlobalCulls.Apply(); - - /* If any inspsockets closed, remove them */ - this->BufferedSocketCull(); + /* if any users were quit, take them out */ + GlobalCulls.Apply(); + AtomicActions.Run(); if (this->s_signal) { @@ -690,87 +806,39 @@ int InspIRCd::Run() return 0; } -void InspIRCd::BufferedSocketCull() -{ - for (std::map::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x) - { - SE->DelFd(x->second); - x->second->Close(); - delete x->second; - } - SocketCull.clear(); -} - /**********************************************************************************/ /** * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*. */ -int main(int argc, char ** argv) -{ - SI = new InspIRCd(argc, argv); - mysig = &SI->s_signal; - SI->Run(); - delete SI; - return 0; -} - /* 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) +bool InspIRCd::AllModulesReportReady(LocalUser* user) { - for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i) - { - int res = (*i)->OnCheckReady(user); - if (!res) - return false; - } - - return true; + ModResult res; + FIRST_MOD_RESULT(OnCheckReady, res, (user)); + return (res == MOD_RES_PASSTHRU); } -time_t InspIRCd::Time(bool delta) -{ - 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() +void InspIRCd::SetSignal(int signal) { - return time_delta; + *mysig = signal; } -void InspIRCd::SetSignal(int signal) +/* On posix systems, the flow of the program starts right here, with + * ENTRYPOINT being a #define that defines main(). On Windows, ENTRYPOINT + * defines smain() and the real main() is in the service code under + * win32service.cpp. This allows the service control manager to control + * the process where we are running as a windows service. + */ +ENTRYPOINT { - *mysig = signal; + new InspIRCd(argc, argv); + mysig = &ServerInstance->s_signal; + ServerInstance->Run(); + delete ServerInstance; + return 0; }